Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

RED-5317: Fixed selected watermarks not showing and save changes dialog.

Browse Source
This commit is contained in:
Nicoleta Panaghiu 2022-10-18 15:10:29 +03:00
parent b4b8c4708d
commit 152ce1ccc4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.html
View File

@ -1,10 +1,10 @@
<div *ngIf="watermarks$ | async as watermarks" class="container"> <div *ngIf="watermarks$ | async as watermarks" class="container">
<div class="iqser-input-group watermark"> <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 }} {{ label }}
</mat-checkbox> </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-select-trigger *ngIf="!!value">
<mat-icon *ngIf="!watermarksMap.get(value)?.enabled" svgIcon="red:warning"></mat-icon> <mat-icon *ngIf="!watermarksMap.get(value)?.enabled" svgIcon="red:warning"></mat-icon>
<span> {{ watermarksMap.get(value)?.name }} </span> <span> {{ watermarksMap.get(value)?.name }} </span>

2
apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.ts
View File

@ -45,7 +45,7 @@ export class WatermarkSelectorComponent extends FormFieldComponent<number> imple
watermarks.forEach(watermark => this.watermarksMap.set(watermark.id, watermark)); watermarks.forEach(watermark => this.watermarksMap.set(watermark.id, watermark));
}), }),
tap(watermarks => { tap(watermarks => {
if (!watermarks.length || this.isReadonly) { if (!watermarks.length) {
this.selectWatermark(null); this.selectWatermark(null);
this.setDisabledState(true); this.setDisabledState(true);
} else { } else {