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

Merge branch 'w2p-98211_advanced-workflow-actions-7.2' into w2p-98211_advanced-workflow-actions-main

Browse Source 
# Conflicts:
#	src/app/access-control/access-control.module.ts
#	src/app/access-control/group-registry/group-form/eperson-list/eperson-list.component.spec.ts
#	src/app/access-control/group-registry/group-form/eperson-list/eperson-list.component.ts
#	src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
#	src/assets/i18n/en.json5
This commit is contained in:
Alexandre Vryghem
2023-01-11 20:38:17 +01:00
parent cd0019eb8a 11b6ec9a9e
commit 6acbb7ec0e
11 changed files with 108 additions and 809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/access-control/access-control.module.ts
View File

@@ -12,7 +12,6 @@ import { GroupsRegistryComponent } from './group-registry/groups-registry.compon
import { FormModule } from '../shared/form/form.module';
import { DYNAMIC_ERROR_MESSAGES_MATCHER, DynamicErrorMessagesMatcher } from '@ng-dynamic-forms/core';
import { AbstractControl } from '@angular/forms';
import { EPersonListComponent } from './group-registry/group-form/eperson-list/eperson-list.component';
/**
* Condition for displaying error messages on email form field
@@ -31,7 +30,7 @@ export const ValidateEmailErrorStateMatcher: DynamicErrorMessagesMatcher =
FormModule,
],
exports: [
EPersonListComponent,
MembersListComponent,
],
declarations: [
EPeopleRegistryComponent,
@@ -40,7 +39,6 @@ export const ValidateEmailErrorStateMatcher: DynamicErrorMessagesMatcher =
GroupFormComponent,
SubgroupsListComponent,
MembersListComponent,
EPersonListComponent,
],
providers: [
{