From e3beeae0e31a517e50815f661ae4a0997aa9297e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Thu, 15 Jul 2021 13:14:55 +0300 Subject: [PATCH] RED-1688 small updates --- .../add-edit-dossier-attribute-dialog.component.html | 11 +++-------- .../add-edit-dossier-attribute-dialog.component.ts | 7 ++++++- apps/red-ui/src/assets/i18n/en.json | 1 - 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.html index 6e2853018..2bb1f1a86 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.html @@ -18,17 +18,12 @@ /> -
+
- +
-
+
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts index c8d88ef23..74d915119 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts @@ -40,7 +40,12 @@ export class AddEditDossierAttributeDialogComponent { this.dossierAttributeForm = this._formBuilder.group({ label: [this.dossierAttribute?.label, Validators.required], - placeholder: [this.dossierAttribute?.placeholder, Validators.required], + ...(!!this.dossierAttribute && { + placeholder: { + value: this.dossierAttribute.placeholder, + disabled: true + } + }), type: [this.dossierAttribute?.type || FileAttributeConfig.TypeEnum.TEXT, Validators.required] }); } diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 83c06c5ec..18852c832 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -91,7 +91,6 @@ "label": "Attribute Name", "label-placeholder": "Enter Name", "placeholder": "Attribute Placeholder", - "placeholder-placeholder": "Enter Placeholder", "type": "Attribute Type" }, "save": "Save Attribute",