hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-10 19:43: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/+item-page/item-page.module.ts
	src/app/core/data/item-data.service.ts
	src/app/shared/shared.module.ts
This commit is contained in:
Kristof De Langhe
2019-09-16 13:36:42 +02:00
parent 683c19bfbe ef8f857fe8
commit 4f6c3c0a9b
27 changed files with 746 additions and 50 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,8 @@ 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 { FilterInputSuggestionsComponent } from './input-suggestions/filter-suggestions/filter-input-suggestions.component';
import { DsoInputSuggestionsComponent } from './input-suggestions/dso-input-suggestions/dso-input-suggestions.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';
@@ -164,7 +166,7 @@ const MODULES = [
NouisliderModule,
MomentModule,
TextMaskModule,
MenuModule
MenuModule,
];
const ROOT_MODULES = [
@@ -250,6 +252,8 @@ const COMPONENTS = [
TruncatablePartComponent,
BrowseByComponent,
InputSuggestionsComponent,
FilterInputSuggestionsComponent,
DsoInputSuggestionsComponent,
DSOSelectorComponent,
CreateCommunityParentSelectorComponent,
CreateCollectionParentSelectorComponent,