From 152ce1ccc4660e93614b9e3b423fdbd9804f7ffb Mon Sep 17 00:00:00 2001
From: Nicoleta Panaghiu <nicoleta@devplant.ro>
Date: Tue, 18 Oct 2022 15:10:29 +0300
Subject: [PATCH] RED-5317: Fixed selected watermarks not showing and save
 changes dialog.

---
 .../watermark-selector.component.html                         | 4 ++--
 .../watermark-selector.component.ts                           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.html b/apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.html
index 87c95f517..ec009eb4e 100644
--- a/apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.html
@@ -1,10 +1,10 @@
 <div *ngIf="watermarks$ | async as watermarks" class="container">
     <div class="iqser-input-group watermark">
-        <mat-checkbox (change)="changeChecked($event)" [checked]="!!value" [disabled]="disabled" color="primary">
+        <mat-checkbox (change)="changeChecked($event)" [checked]="!!value" [disabled]="disabled || isReadonly" color="primary">
             {{ label }}
         </mat-checkbox>
 
-        <mat-select (selectionChange)="selectWatermark($event.value)" *ngIf="!!value" [value]="value">
+        <mat-select (selectionChange)="selectWatermark($event.value)" *ngIf="!!value" [value]="value" [disabled]="disabled || isReadonly">
             <mat-select-trigger *ngIf="!!value">
                 <mat-icon *ngIf="!watermarksMap.get(value)?.enabled" svgIcon="red:warning"></mat-icon>
                 <span> {{ watermarksMap.get(value)?.name }} </span>
diff --git a/apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.ts b/apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.ts
index 7d8a04abe..bf29d44b6 100644
--- a/apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.ts
+++ b/apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.ts
@@ -45,7 +45,7 @@ export class WatermarkSelectorComponent extends FormFieldComponent<number> imple
                 watermarks.forEach(watermark => this.watermarksMap.set(watermark.id, watermark));
             }),
             tap(watermarks => {
-                if (!watermarks.length || this.isReadonly) {
+                if (!watermarks.length) {
                     this.selectWatermark(null);
                     this.setDisabledState(true);
                 } else {