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

Merge branch 'master' into VM/DM-337

Browse Source
This commit is contained in:
Valentin Mihai 2023-07-21 15:39:07 +03:00
commit 66bc6a8437
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/red-ui/src/app/modules/shared/dialogs/download-dialog/download-dialog.component.html
View File

@ -24,7 +24,7 @@
formControlName="downloadFileTypes" formControlName="downloadFileTypes"
></redaction-select> ></redaction-select>
<div class="iqser-input-group required" *deny="roles.getRss"> <div *deny="roles.getRss" class="iqser-input-group required">
<label translate="download-dialog.form.redaction-preview-color"></label> <label translate="download-dialog.form.redaction-preview-color"></label>
<input <input
[placeholder]="'download-dialog.form.redaction-preview-color-placeholder' | translate" [placeholder]="'download-dialog.form.redaction-preview-color-placeholder' | translate"
@ -58,7 +58,7 @@
</div> </div>
</form> </form>
<iqser-circle-button (action)="close()" class="dialog-close" icon="iqser:close"></iqser-circle-button> <iqser-circle-button (action)="dialogRef.close()" class="dialog-close" icon="iqser:close"></iqser-circle-button>
</section> </section>
<ng-template #reportTemplateOptionTemplate let-option="option"> <ng-template #reportTemplateOptionTemplate let-option="option">

4
apps/red-ui/src/app/modules/shared/dialogs/download-dialog/download-dialog.component.ts
View File

@ -131,10 +131,6 @@ export class DownloadDialogComponent extends IqserDialogComponent<DownloadDialog
this.#logger.info('[DOWNLOAD] Closing with result', result); this.#logger.info('[DOWNLOAD] Closing with result', result);
if (result.reportTemplateIds.length === 0) {
return super.close();
}
super.close(result); super.close(result);
} }

2
libs/common-ui

@ -1 +1 @@
Subproject commit fd4491b2a39792ffe3ef76155c1572a45e38406e Subproject commit 2524896f460594d7766a7c572b63cd3199eac7db