hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Login-as-EPerson

Browse Source 
Conflicts:
	src/app/shared/shared.module.ts
This commit is contained in:
Kristof De Langhe
2020-05-19 10:01:10 +02:00
parent 3894b3615d b28f59f087
commit ad26ececbf
42 changed files with 1233 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/app-routing.module.ts
View File

@@ -45,6 +45,12 @@ export function getProfileModulePath() {
return `/${PROFILE_MODULE_PATH}`;
}
const WORKFLOW_ITEM_MODULE_PATH = 'workflowitems';
export function getWorkflowItemModulePath() {
return `/${WORKFLOW_ITEM_MODULE_PATH}`;
}
export function getDSOPath(dso: DSpaceObject): string {
switch ((dso as any).type) {
case Community.type.value:
@@ -74,7 +80,7 @@ export function getDSOPath(dso: DSpaceObject): string {
loadChildren: './+my-dspace-page/my-dspace-page.module#MyDSpacePageModule',
canActivate: [AuthenticatedGuard]
},
{ path: 'search', loadChildren: './+search-page/search-page.module#SearchPageModule' },
{ path: 'search', loadChildren: './+search-page/search-page-routing.module#SearchPageRoutingModule' },
{ path: 'browse', loadChildren: './+browse-by/browse-by.module#BrowseByModule'},
{ path: ADMIN_MODULE_PATH, loadChildren: './+admin/admin.module#AdminModule', canActivate: [AuthenticatedGuard] },
{ path: 'login', loadChildren: './+login-page/login-page.module#LoginPageModule' },
@@ -85,7 +91,7 @@ export function getDSOPath(dso: DSpaceObject): string {
loadChildren: './+workspaceitems-edit-page/workspaceitems-edit-page.module#WorkspaceitemsEditPageModule'
},
{
path: 'workflowitems',
path: WORKFLOW_ITEM_MODULE_PATH,
loadChildren: './+workflowitems-edit-page/workflowitems-edit-page.module#WorkflowItemsEditPageModule'
},
{