Merge branch 'master' into metadata-and-relationships-combined-in-submission

This commit is contained in:
Art Lowel
2020-06-30 11:49:08 +02:00
parent 775becd656
commit 3e6195a124
70 changed files with 1779 additions and 2298 deletions

View File

@@ -203,6 +203,7 @@ import { ResourcePolicyTargetResolver } from './resource-policies/resolvers/reso
import { ResourcePolicyResolver } from './resource-policies/resolvers/resource-policy.resolver';
import { EpersonSearchBoxComponent } from './resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component';
import { GroupSearchBoxComponent } from './resource-policies/form/eperson-group-list/group-search-box/group-search-box.component';
import { CollectionDropdownComponent } from './collection-dropdown/collection-dropdown.component';
const MODULES = [
// Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -388,7 +389,8 @@ const COMPONENTS = [
ResourcePolicyFormComponent,
EpersonGroupListComponent,
EpersonSearchBoxComponent,
GroupSearchBoxComponent
GroupSearchBoxComponent,
CollectionDropdownComponent
];
const ENTRY_COMPONENTS = [
@@ -507,8 +509,7 @@ const DIRECTIVES = [
...COMPONENTS,
...DIRECTIVES,
...ENTRY_COMPONENTS,
...SHARED_ITEM_PAGE_COMPONENTS,
...SHARED_ITEM_PAGE_COMPONENTS
],
providers: [
...PROVIDERS