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

RED-6774 - fixed add hint issues

Browse Source
This commit is contained in:
Valentin Mihai 2023-07-07 15:28:44 +03:00
parent f20f7d3801
commit b1ed081895
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.html
View File

@ -39,22 +39,10 @@
<label [translate]="'redact-text.dialog.content.legal-basis'"></label>
<input [value]="form.get('reason').value?.legalBasis" disabled type="text" />
</div>
<div class="iqser-input-group w-450">
<label [translate]="'redact-text.dialog.content.comment'"></label>
<textarea
formControlName="comment"
iqserHasScrollbar
name="comment"
rows="4"
type="text"
[placeholder]="'redact-text.dialog.content.comment-placeholder' | translate"
></textarea>
</div>
</ng-container>
<ng-container *deny="roles.getRss; if: dictionaryRequest || type === 'HINT'">
<div class="iqser-input-group required w-450">
<div class="iqser-input-group required w-450" *ngIf="dictionaryRequest">
<label [translate]="'redact-text.dialog.content.type'"></label>
<mat-form-field>
@ -72,6 +60,18 @@
</mat-form-field>
</div>
</ng-container>
<div *ngIf="!dictionaryRequest" class="iqser-input-group w-450">
<label [translate]="'redact-text.dialog.content.comment'"></label>
<textarea
formControlName="comment"
iqserHasScrollbar
name="comment"
rows="4"
type="text"
[placeholder]="'redact-text.dialog.content.comment-placeholder' | translate"
></textarea>
</div>
</div>
<div class="dialog-actions">

4
apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.ts
View File

@ -202,9 +202,7 @@ export class RedactTextDialogComponent
addRedactionRequest.value = addRedactionRequest.rectangle
? this.form.get('classification').value
: this.form.get('selectedText').value;
if (this.dictionaryRequest) {
addRedactionRequest.addToAllDossiers = this.#applyToAllDossiers;
}
addRedactionRequest.addToAllDossiers = this.dictionaryRequest && this.#applyToAllDossiers;
}
#options() {

2
apps/red-ui/src/app/services/entity-services/dictionary.service.ts
View File

@ -157,7 +157,7 @@ export class DictionaryService extends EntitiesService<IDictionary, Dictionary>
) {
possibleDictionaries.push(d);
}
} else if (d.hint) {
} else if ((d.hint && d.hasDictionary && d.addToDictionaryAction) || (dossierDictionaryOnly && d.dossierDictionaryOnly)) {
possibleDictionaries.push(d);
}
});