From 18992ed7e0779a0bc89c036b9b23ddf47193f0a8 Mon Sep 17 00:00:00 2001 From: Guillaume Heurtier <guillaume.heurtier@maarch.org> Date: Fri, 21 Feb 2020 18:32:26 +0100 Subject: [PATCH] FEAT #12069 TIME 0:20 hide tag select if cannot merge tags --- .../administration/tag/tag-administration.component.html | 7 +++++-- src/frontend/lang/lang-en.ts | 2 ++ src/frontend/lang/lang-fr.ts | 2 ++ src/frontend/lang/lang-nl.ts | 2 ++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/frontend/app/administration/tag/tag-administration.component.html b/src/frontend/app/administration/tag/tag-administration.component.html index eb53202ee95..de963b968f0 100644 --- a/src/frontend/app/administration/tag/tag-administration.component.html +++ b/src/frontend/app/administration/tag/tag-administration.component.html @@ -33,7 +33,10 @@ <mat-form-field> <input matInput type="text" [formControl]="tag.usage" [placeholder]="lang.usage"> </mat-form-field> - <plugin-select-search *ngIf="!loadingTags" [label]="'Fusionner le mot-clé avec'" [placeholderLabel]="'Fusionner le mot-clé avec'" + <div *ngIf="!tag.canMerge" class="alert-message alert-message-danger"> + {{this.lang.cannotMergeTags}} + </div> + <plugin-select-search *ngIf="!loadingTags && tag.canMerge" [label]="this.lang.mergeTagWith" [placeholderLabel]="this.lang.mergeTagWith" [formControlSelect]="selectMergeTag" [datas]="tags" (afterOpened)="getTags()" (afterSelected)="mergeTag($event)" style="width:100%;"> </plugin-select-search> @@ -46,4 +49,4 @@ </div> </div> </mat-sidenav-content> -</mat-sidenav-container> \ No newline at end of file +</mat-sidenav-container> diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts index 660f9c01f7a..6b4e43f82ad 100755 --- a/src/frontend/lang/lang-en.ts +++ b/src/frontend/lang/lang-en.ts @@ -1555,4 +1555,6 @@ export const LANG_EN = { "emptySubject" : "Empty subject", "editAcknowledgementReceipt" : "Edit the acknowledgement receipt", "insufficientPrivilege" : "Privilege insuffisant", + "cannotMergeTags" : "This tag has a parent or children : impossible to merge tags", + "mergeTagWith" : "Merge this tag with", }; diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts index f3289c79a9e..f454edf137a 100755 --- a/src/frontend/lang/lang-fr.ts +++ b/src/frontend/lang/lang-fr.ts @@ -1594,4 +1594,6 @@ export const LANG_FR = { "emptySubject" : "Objet vide", "editAcknowledgementReceipt" : "Editer l'accusé de réception", "insufficientPrivilege" : "Privilège insuffisant", + "cannotMergeTags" : "Ce mot-clé possède un parent ou des enfants : impossible de le fusionner avec un autre mot clé.", + "mergeTagWith" : "Fusionner le mot-clé avec", }; diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts index 751f7f536a7..80437b2e908 100755 --- a/src/frontend/lang/lang-nl.ts +++ b/src/frontend/lang/lang-nl.ts @@ -1580,4 +1580,6 @@ export const LANG_NL = { "emptySubject" : "Empty subject", //_TO_TRANSLATE "editAcknowledgementReceipt" : "Edit the acknowledgement receipt", //_TO_TRANSLATE "insufficientPrivilege" : "Privilege insuffisant", //TRANSLATE + "cannotMergeTags" : "This tag has a parent or children : impossible to merge tags",//_TO_TRANSLATE + "mergeTagWith" : "Merge this tag with",//_TO_TRANSLATE }; -- GitLab