From 62120517b1877cd786726315dbc9f49172893446 Mon Sep 17 00:00:00 2001 From: amentis Date: Thu, 23 May 2024 11:12:30 +0300 Subject: [PATCH] disabled drag contacts and disable dmp user fields when canEdit is false --- .../ui/dmp/dmp-editor-blueprint/dmp-editor.component.html | 7 +++---- .../app/ui/dmp/dmp-editor-blueprint/dmp-editor.model.ts | 3 ++- .../ui/dmp/dmp-user-field/dmp-user-field.component.html | 8 ++++---- .../app/ui/dmp/dmp-user-field/dmp-user-field.component.ts | 2 +- .../dialog/dmp-invitation-dialog.component.html | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html index 6da89be36..915fcd9c9 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html +++ b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html @@ -189,10 +189,10 @@
-
+
{{contactIndex + 1}} - drag_indicator + drag_indicator
@@ -269,8 +269,7 @@
- -
+
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 177329329..ce05a6a66 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 @@ -93,7 +93,8 @@ export class DmpEditorModel extends BaseEditorModel implements DmpPersist { users: this.formBuilder.array( (this.users ?? []).map( (item, index) => item.buildForm({ - rootPath: `users[${index}].` + rootPath: `users[${index}].`, + disabled: disabled }) ), context.getValidation('users').validators ), 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 1906960bd..8b769a12f 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 @@ -2,7 +2,7 @@
-
+
@@ -20,7 +20,7 @@
-
@@ -32,7 +32,7 @@
{{userIndex + 1}} - drag_indicator + drag_indicator
@@ -87,7 +87,7 @@
-
diff --git a/dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.component.ts b/dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.component.ts index 50365d230..810aef4b5 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.component.ts +++ b/dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.component.ts @@ -25,7 +25,7 @@ export class DmpUserFieldComponent extends BaseComponent implements OnInit { @Input() placeholder: string; @Input() sections: DmpBlueprintDefinitionSection[] = null; @Input() initializeUsers: boolean = false; - + @Input() viewOnly: boolean = false; @Input() enableSorting: boolean = true; hoveredUser:number = -1; hasTemplatesSections: DmpBlueprintDefinitionSection[] = null; diff --git a/dmp-frontend/src/app/ui/dmp/invitation/dialog/dmp-invitation-dialog.component.html b/dmp-frontend/src/app/ui/dmp/invitation/dialog/dmp-invitation-dialog.component.html index d969e2a63..cd2bd846e 100644 --- a/dmp-frontend/src/app/ui/dmp/invitation/dialog/dmp-invitation-dialog.component.html +++ b/dmp-frontend/src/app/ui/dmp/invitation/dialog/dmp-invitation-dialog.component.html @@ -9,7 +9,7 @@
- +