From a7d09e2efb68ca5d7383a8aea87f1a887f66195a Mon Sep 17 00:00:00 2001 From: Alex ORLUC <alex.orluc@maarch.org> Date: Thu, 26 Sep 2019 17:27:35 +0200 Subject: [PATCH] FIX #11271 TIME 0:15 fix button date --- .../app/indexation/indexing-form/indexing-form.component.html | 2 +- .../app/indexation/indexing-form/indexing-form.component.ts | 1 + src/frontend/lang/lang-en.ts | 1 + src/frontend/lang/lang-fr.ts | 1 + src/frontend/lang/lang-nl.ts | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/frontend/app/indexation/indexing-form/indexing-form.component.html b/src/frontend/app/indexation/indexing-form/indexing-form.component.html index bb7dd149d57..15d9da19b90 100644 --- a/src/frontend/app/indexation/indexing-form/indexing-form.component.html +++ b/src/frontend/app/indexation/indexing-form/indexing-form.component.html @@ -81,7 +81,7 @@ <mat-datepicker-toggle matSuffix [for]="picker" *ngIf="!arrFormControl[field.identifier].value"> </mat-datepicker-toggle> <mat-datepicker #picker></mat-datepicker> - <button mat-button color="warn" matSuffix mat-icon-button *ngIf="arrFormControl[field.identifier].value" + <button mat-button color="warn" matSuffix mat-icon-button *ngIf="arrFormControl[field.identifier].value && !arrFormControl[field.identifier].disabled" (click)="$event.stopPropagation();arrFormControl[field.identifier].reset();" title="Effacer la valeur"> <mat-icon color="warn" class="fa fa-calendar-times"> diff --git a/src/frontend/app/indexation/indexing-form/indexing-form.component.ts b/src/frontend/app/indexation/indexing-form/indexing-form.component.ts index 82012d7e606..c3c26f4ba54 100644 --- a/src/frontend/app/indexation/indexing-form/indexing-form.component.ts +++ b/src/frontend/app/indexation/indexing-form/indexing-form.component.ts @@ -625,6 +625,7 @@ export class IndexingFormComponent implements OnInit { this.arrFormControl[field.identifier].disable(); this.arrFormControl[field.identifier].setValue(new Date()); } else { + this.arrFormControl[field.identifier].setValue(''); this.arrFormControl[field.identifier].enable(); } } diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts index 652e561c917..4941bce8c3f 100755 --- a/src/frontend/lang/lang-en.ts +++ b/src/frontend/lang/lang-en.ts @@ -1122,4 +1122,5 @@ export const LANG_EN = { "initiatorEntityAlt" : "Initiator entity", "autocompleteInput" : "Autocomplete input", "typeEnterToCreate" : "Type on <b>enter</b> to create element", + "ged_doc" : "GED Document", }; diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts index b800763563a..8e4387d9bcb 100755 --- a/src/frontend/lang/lang-fr.ts +++ b/src/frontend/lang/lang-fr.ts @@ -1159,4 +1159,5 @@ export const LANG_FR = { "initiatorEntityAlt" : "Entité initiatrice", "autocompleteInput" : "Auto-completion", "typeEnterToCreate" : "Taper sur <b>entrée</b> pour créer l'element", + "ged_doc" : "Document GED", }; diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts index 0d2a96f27b0..c0c2ac962e9 100755 --- a/src/frontend/lang/lang-nl.ts +++ b/src/frontend/lang/lang-nl.ts @@ -1148,4 +1148,5 @@ export const LANG_NL = { "initiatorEntityAlt" : "Initiator entity", //_TO_TRANSLATE "autocompleteInput" : "Autocomplete input", //_TO_TRANSLATE "typeEnterToCreate" : "Type on <b>enter</b> to create element", //_TO_TRANSLATE + "ged_doc" : "GED Document", //_TO_TRANSLATE }; -- GitLab