diff --git a/dmp-frontend/src/app/core/model/dmp/dmp.ts b/dmp-frontend/src/app/core/model/dmp/dmp.ts index a896f255f..06ae719d8 100644 --- a/dmp-frontend/src/app/core/model/dmp/dmp.ts +++ b/dmp-frontend/src/app/core/model/dmp/dmp.ts @@ -140,7 +140,7 @@ export interface DmpUserPersist { user: Guid; role: DmpUserRole; email: string; - sectionId: Guid; + sectionId: string; } export interface DmpUserRemovePersist { diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.model.ts b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.model.ts index 3203fce13..1cc910dbf 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.model.ts +++ b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.model.ts @@ -526,7 +526,7 @@ export class DmpUserEditorModel implements DmpUserPersist { role: DmpUserRole; email: string; userType: DmpUserType = DmpUserType.Internal; - sectionId: Guid; + sectionId: string = ''; protected formBuilder: UntypedFormBuilder = new UntypedFormBuilder(); @@ -539,7 +539,7 @@ export class DmpUserEditorModel implements DmpUserPersist { this.role = item.role; // TODO this.email = item.email; this.userType = (item == null || this.user != null) ? DmpUserType.Internal : DmpUserType.External; - this.sectionId = item.sectionId; + this.sectionId = item.sectionId?.toString() || ''; //Trick to allow a null option for all items. return this; } diff --git a/dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.component.html b/dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.component.html index 81bf5d7c8..bf1a4bd5e 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.component.html +++ b/dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.component.html @@ -1,18 +1,18 @@
- +
- +
- +
- +
@@ -26,7 +26,7 @@
- + @@ -69,8 +69,9 @@
- {{'DMP-EDITOR.FIELDS.SECTION' | translate}} + {{'DMP-EDITOR.FIELDS.SECTIONS' | translate}} + {{'DMP-EDITOR.FIELDS.ALL-SECTIONS' | translate}} {{ section.label }} @@ -87,4 +88,4 @@ {{'DMP-EDITOR.USERS-REQUIRED' | translate}} {{form.get('users').getError('backendError').message}} - + \ No newline at end of file diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index 00ba9b5b3..50fa874ac 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -1525,7 +1525,8 @@ "EMAIL": "Email", "USER": "User", "USER-ROLE": "Role", - "SECTION": "Specific DMP Section", + "SECTIONS": "Plan Sections", + "ALL-SECTIONS": "All", "DMP-BLUEPRINT-VERSION": "Version" }, "ACTIONS": {