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

Merge branch 'master' into w2p-62589_Item-mapper-update

Browse Source 
Conflicts:
	src/app/+item-page/edit-item-page/edit-item-page.module.ts
	src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
	src/app/+search-page/search-service/search.service.ts
This commit is contained in:
Kristof De Langhe
2019-09-06 12:52:36 +02:00
parent 04f57b753e 3a68b6dd7b
commit 7fe0db7d7c
46 changed files with 1908 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/+item-page/edit-item-page/edit-item-page.module.ts
View File

@@ -17,6 +17,9 @@ import { EditInPlaceFieldComponent } from './item-metadata/edit-in-place-field/e
import { ItemBitstreamsComponent } from './item-bitstreams/item-bitstreams.component';
import { SearchPageModule } from '../../+search-page/search-page.module';
import { ItemCollectionMapperComponent } from './item-collection-mapper/item-collection-mapper.component';
import { ItemRelationshipsComponent } from './item-relationships/item-relationships.component';
import { EditRelationshipComponent } from './item-relationships/edit-relationship/edit-relationship.component';
import { EditRelationshipListComponent } from './item-relationships/edit-relationship-list/edit-relationship-list.component';
/**
* Module that contains all components related to the Edit Item page administrator functionality
@@ -40,8 +43,11 @@ import { ItemCollectionMapperComponent } from './item-collection-mapper/item-col
ItemDeleteComponent,
ItemStatusComponent,
ItemMetadataComponent,
ItemRelationshipsComponent,
ItemBitstreamsComponent,
EditInPlaceFieldComponent,
EditRelationshipComponent,
EditRelationshipListComponent,
ItemCollectionMapperComponent
]
})