1
0

Merge branch 'master' into w2p-68346_Bundles-in-edit-item-Updates

Conflicts:
	src/app/shared/shared.module.ts
This commit is contained in:
Kristof De Langhe
2020-03-25 14:01:44 +01:00
7 changed files with 222 additions and 1 deletions

View File

@@ -181,6 +181,7 @@ import { SortablejsModule } from 'ngx-sortablejs';
import { CustomSwitchComponent } from './form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component';
import { BundleListElementComponent } from './object-list/bundle-list-element/bundle-list-element.component';
import { MissingTranslationHelper } from './translate/missing-translation.helper';
import { ItemVersionsNoticeComponent } from './item/item-versions/notice/item-versions-notice.component';
const MODULES = [
// Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -352,6 +353,7 @@ const COMPONENTS = [
ExistingMetadataListElementComponent,
ItemVersionsComponent,
PublicationSearchResultListElementComponent,
ItemVersionsNoticeComponent
];
const ENTRY_COMPONENTS = [
@@ -417,7 +419,8 @@ const ENTRY_COMPONENTS = [
DsDynamicLookupRelationExternalSourceTabComponent,
ExternalSourceEntryImportModalComponent,
ItemVersionsComponent,
BundleListElementComponent
BundleListElementComponent,
ItemVersionsNoticeComponent
];
const SHARED_ITEM_PAGE_COMPONENTS = [