hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 07:23:03 +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

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

@@ -11,26 +11,30 @@ import { DeleteCollectionPageComponent } from './delete-collection-page/delete-c
import { SearchService } from '../+search-page/search-service/search.service';
import { EditItemTemplatePageComponent } from './edit-item-template-page/edit-item-template-page.component';
import { EditItemPageModule } from '../+item-page/edit-item-page/edit-item-page.module';
import { CollectionItemMapperComponent } from './collection-item-mapper/collection-item-mapper.component';
import { SearchFixedFilterService } from '../+search-page/search-filters/search-filter/search-fixed-filter.service';
@NgModule({
imports: [
CommonModule,
SharedModule,
EditItemPageModule,
CollectionPageRoutingModule
CollectionPageRoutingModule,
EditItemPageModule
],
declarations: [
CollectionPageComponent,
CreateCollectionPageComponent,
DeleteCollectionPageComponent,
CollectionFormComponent,
EditItemTemplatePageComponent
EditItemTemplatePageComponent,
CollectionItemMapperComponent
],
exports: [
CollectionFormComponent
],
providers: [
SearchService
SearchService,
SearchFixedFilterService
]
})
export class CollectionPageModule {