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

Merge branch 'master' into w2p-65272_Edit-collection-item-template

Browse Source 
Conflicts:
	resources/i18n/en.json5
	src/app/+collection-page/collection-page-routing.module.ts
	src/app/+collection-page/collection-page.module.ts
	src/app/core/core.module.ts
	src/app/core/data/data.service.ts
	src/app/shared/shared.module.ts
This commit is contained in:
Kristof De Langhe
2019-11-29 11:04:06 +01:00
parent b3b8ea1dee 7f44c7751b
commit b3371c5c14
551 changed files with 45914 additions and 5158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/+collection-page/collection-page-routing.module.ts
View File

@@ -11,6 +11,7 @@ import { URLCombiner } from '../core/url-combiner/url-combiner';
import { getCollectionModulePath } from '../app-routing.module';
import { EditItemTemplatePageComponent } from './edit-item-template-page/edit-item-template-page.component';
import { ItemTemplatePageResolver } from './edit-item-template-page/item-template-page.resolver';
import { CollectionItemMapperComponent } from './collection-item-mapper/collection-item-mapper.component';
export const COLLECTION_PARENT_PARAMETER = 'parent';
@@ -68,6 +69,15 @@ const ITEMTEMPLATE_PATH = ':id/itemtemplate';
resolve: {
collection: CollectionPageResolver
}
},
{
path: ':id/edit/mapper',
component: CollectionItemMapperComponent,
pathMatch: 'full',
resolve: {
collection: CollectionPageResolver
},
canActivate: [AuthenticatedGuard]
}
])
],