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

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

Browse Source 
Conflicts:
	src/app/app.reducer.ts
	src/app/shared/shared.module.ts
This commit is contained in:
Kristof De Langhe
2019-09-05 14:16:13 +02:00
parent c95fa8fb96 36f134f1c6
commit 04f57b753e
99 changed files with 3058 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/shared/shared.module.ts
View File

@@ -140,6 +140,9 @@ import { ClaimedTaskActionsReturnToPoolComponent } from './mydspace-actions/clai
import { ItemDetailPreviewFieldComponent } from './object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component';
import { ItemSelectComponent } from './object-select/item-select/item-select.component';
import { CollectionSelectComponent } from './object-select/collection-select/collection-select.component';
import { TypedItemSearchResultGridElementComponent } from './object-grid/item-grid-element/item-types/typed-item-search-result-grid-element.component';
import { PublicationGridElementComponent } from './object-grid/item-grid-element/item-types/publication/publication-grid-element.component';
import { ItemTypeBadgeComponent } from './object-list/item-type-badge/item-type-badge.component';
const MODULES = [
// Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -258,8 +261,10 @@ const COMPONENTS = [
CollectionSearchResultListElementComponent,
ItemSearchResultListElementComponent,
TypedItemSearchResultListElementComponent,
TypedItemSearchResultGridElementComponent,
ItemTypeSwitcherComponent,
BrowseByComponent,
ItemTypeBadgeComponent,
ItemSelectComponent,
CollectionSelectComponent
];
@@ -279,6 +284,7 @@ const ENTRY_COMPONENTS = [
CommunityGridElementComponent,
SearchResultGridElementComponent,
PublicationListElementComponent,
PublicationGridElementComponent,
BrowseEntryListElementComponent,
MyDSpaceResultDetailElementComponent,
SearchResultGridElementComponent,