From a0ee89a7d9b85afc716c2f8cec6439a10b787aa3 Mon Sep 17 00:00:00 2001 From: "florian.azizian" <florian.azizian@maarch.org> Date: Tue, 25 Feb 2020 11:28:25 +0100 Subject: [PATCH] FIX #12346 TIME 0:30 error after added user in workflow in send to external signatory book --- src/frontend/app/visa/visa-workflow.component.html | 2 +- src/frontend/app/visa/visa-workflow.component.ts | 3 --- src/frontend/lang/lang-en.ts | 1 + src/frontend/lang/lang-fr.ts | 1 + src/frontend/lang/lang-nl.ts | 1 + 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/frontend/app/visa/visa-workflow.component.html b/src/frontend/app/visa/visa-workflow.component.html index 497bc0a0535..95475d501b3 100644 --- a/src/frontend/app/visa/visa-workflow.component.html +++ b/src/frontend/app/visa/visa-workflow.component.html @@ -1,7 +1,7 @@ <mat-list *ngIf="!loading"> <mat-form-field appearance="outline" *ngIf="adminMode && !linkedToMaarchParapheur"> - <input type="text" #searchVisaSignUserInput matInput placeholder="Ajouter des personnes" id="searchVisaSignUserInput" + <input type="text" #searchVisaSignUserInput matInput placeholder="{{lang.addUsers}}" id="searchVisaSignUserInput" [formControl]="searchVisaSignUser" [matAutocomplete]="autoGroup"> <mat-autocomplete #autoGroup="matAutocomplete" (optionSelected)="addItemToWorkflow($event.option.value)" (opened)="initFilterVisaModelList()"> <mat-option disabled *ngIf="visaModelListNotLoaded"> diff --git a/src/frontend/app/visa/visa-workflow.component.ts b/src/frontend/app/visa/visa-workflow.component.ts index 6a758e405bb..be17229cc17 100644 --- a/src/frontend/app/visa/visa-workflow.component.ts +++ b/src/frontend/app/visa/visa-workflow.component.ts @@ -451,7 +451,6 @@ export class VisaWorkflowComponent implements OnInit { this.getMaarchParapheurUserAvatar(item.externalId.maarchParapheur, this.visaWorkflow.items.length - 1); } this.searchVisaSignUser.reset(); - this.searchVisaSignUserInput.nativeElement.blur(); } else if (item.type === 'user') { @@ -470,7 +469,6 @@ export class VisaWorkflowComponent implements OnInit { this.getMaarchParapheurUserAvatar(item.externalId.maarchParapheur, this.visaWorkflow.items.length - 1); } this.searchVisaSignUser.reset(); - this.searchVisaSignUserInput.nativeElement.blur(); } else if (item.type === 'entity') { this.http.get(`../../rest/listTemplates/${item.id}`).pipe( tap((data: any) => { @@ -489,7 +487,6 @@ export class VisaWorkflowComponent implements OnInit { }) ); this.searchVisaSignUser.reset(); - this.searchVisaSignUserInput.nativeElement.blur(); }) ).subscribe(); } diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts index 7391c950e39..b57c6604947 100755 --- a/src/frontend/lang/lang-en.ts +++ b/src/frontend/lang/lang-en.ts @@ -1567,6 +1567,7 @@ export const LANG_EN = { "attachSummarySheet" : "Attach the summary sheet", "generateSeparators" : "Generate separators for each elements", "theTag" : "The tag", + "addUsers" : "Add users", "willBeDeletedAndMerged" : "will be deleted and merged with the tag", "mailing" : "Mailing", "enableMailing" : "Enable mailing", diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts index 47666ae59e7..65f1bdab7b6 100755 --- a/src/frontend/lang/lang-fr.ts +++ b/src/frontend/lang/lang-fr.ts @@ -1606,6 +1606,7 @@ export const LANG_FR = { "attachSummarySheet" : "Attacher la fiche de liaison", "generateSeparators" : "Générer des intercalaires entre les élements", "theTag" : "Le mot-clé", + "addUsers" : "Ajouter des utilisateurs", "willBeDeletedAndMerged" : "sera supprimé et fusionné avec le mot-clé", "mailing" : "Publipostage", "enableMailing" : "Activer le publipostage", diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts index ea3bea3c8d3..f0beba24c5f 100755 --- a/src/frontend/lang/lang-nl.ts +++ b/src/frontend/lang/lang-nl.ts @@ -1592,6 +1592,7 @@ export const LANG_NL = { "attachSummarySheet" : "Attach the summary sheet", //_TO_TRANSLATE "generateSeparators" : "Generate separators for each elements", //_TO_TRANSLATE "theTag" : "The tag",//_TO_TRANSLATE + "addUsers" : "Add users", //_TO_TRANSLATE "willBeDeletedAndMerged" : "will be deleted and merged with the tag", //_TO_TRANSLATE "mailing" : "Mailing", //_TO_TRANSLATE "enableMailing" : "Enable mailing", //_TO_TRANSLATE -- GitLab