Merge branch 'master' into CC-License-Submission-Step

This commit is contained in:
Samuel
2020-06-12 09:04:29 +02:00
123 changed files with 6992 additions and 2296 deletions

View File

@@ -193,6 +193,15 @@ import { ModifyItemOverviewComponent } from '../+item-page/edit-item-page/modify
import { ClaimedTaskActionsLoaderComponent } from './mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component';
import { ClaimedTaskActionsDirective } from './mydspace-actions/claimed-task/switcher/claimed-task-actions.directive';
import { ClaimedTaskActionsEditMetadataComponent } from './mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component';
import { ImpersonateNavbarComponent } from './impersonate-navbar/impersonate-navbar.component';
import { ResourcePoliciesComponent } from './resource-policies/resource-policies.component';
import { NgForTrackByIdDirective } from './ng-for-track-by-id.directive';
import { ResourcePolicyFormComponent } from './resource-policies/form/resource-policy-form.component';
import { EpersonGroupListComponent } from './resource-policies/form/eperson-group-list/eperson-group-list.component';
import { ResourcePolicyTargetResolver } from './resource-policies/resolvers/resource-policy-target.resolver';
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 { DsSelectComponent } from './ds-select/ds-select.component';
const MODULES = [
@@ -374,6 +383,12 @@ const COMPONENTS = [
PublicationSearchResultListElementComponent,
ItemVersionsNoticeComponent,
ModifyItemOverviewComponent,
ImpersonateNavbarComponent,
ResourcePoliciesComponent,
ResourcePolicyFormComponent,
EpersonGroupListComponent,
EpersonSearchBoxComponent,
GroupSearchBoxComponent
];
const ENTRY_COMPONENTS = [
@@ -461,7 +476,9 @@ const PROVIDERS = [
{
provide: DYNAMIC_FORM_CONTROL_MAP_FN,
useValue: dsDynamicFormControlMapFn
}
},
ResourcePolicyResolver,
ResourcePolicyTargetResolver
];
const DIRECTIVES = [
@@ -475,7 +492,8 @@ const DIRECTIVES = [
RoleDirective,
MetadataRepresentationDirective,
ListableObjectDirective,
ClaimedTaskActionsDirective
ClaimedTaskActionsDirective,
NgForTrackByIdDirective
];
@NgModule({