diff --git a/src/frontend/app/administration/tag/tag-administration.component.html b/src/frontend/app/administration/tag/tag-administration.component.html index eb53202ee952d82e9588a2c5e56040c914de928d..de963b968f08ae69ff0025c18c0dc67ad8331087 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 660f9c01f7a6ebea84fbf62d5f5ceb82530fe788..6b4e43f82ad9b6be394e254c1e943699b3bc8cc2 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 f3289c79a9ee167a7b161e967a4918dd015e7b88..f454edf137ab5e1da77155c2ee551b9fc1632799 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 751f7f536a79b7f77f739b3c0f1ee362e4893cb1..80437b2e908f40494104357c3cffc07a0deb8354 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 };