Merge remote-tracking branch 'dspace/main' into w2p-77205_issue-927-Non-site-admin-edit-authorization-group

Conflicts:
	src/app/+collection-page/collection-page.component.html
	src/app/+collection-page/collection-page.component.ts
	src/app/+community-page/community-page.component.html
	src/app/+community-page/community-page.component.ts
	src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
This commit is contained in:
Raf Ponsaerts
2021-03-18 10:37:06 +01:00
417 changed files with 50672 additions and 12974 deletions

View File

@@ -5,6 +5,7 @@ import { Item } from './core/shared/item.model';
import { getCommunityPageRoute } from './+community-page/community-page-routing-paths';
import { getCollectionPageRoute } from './+collection-page/collection-page-routing-paths';
import { getItemPageRoute } from './+item-page/item-page-routing-paths';
import { hasValue } from './shared/empty.util';
export const BITSTREAM_MODULE_PATH = 'bitstreams';
@@ -45,13 +46,15 @@ export function getWorkflowItemModuleRoute() {
}
export function getDSORoute(dso: DSpaceObject): string {
switch ((dso as any).type) {
case Community.type.value:
return getCommunityPageRoute(dso.uuid);
case Collection.type.value:
return getCollectionPageRoute(dso.uuid);
case Item.type.value:
return getItemPageRoute(dso.uuid);
if (hasValue(dso)) {
switch ((dso as any).type) {
case Community.type.value:
return getCommunityPageRoute(dso.uuid);
case Collection.type.value:
return getCollectionPageRoute(dso.uuid);
case Item.type.value:
return getItemPageRoute(dso as Item);
}
}
}