From 84d6f862cd2c0ce7fc7e1a7a413da932c57a9c36 Mon Sep 17 00:00:00 2001
From: "hamza.hramchi" <hamza.hramchi@xelians.fr>
Date: Fri, 30 Oct 2020 14:52:26 +0100
Subject: [PATCH] FEAT #14154 TIME 0:04 display the merge with field in the
case of modification
---
.../app/administration/tag/tag-administration.component.html | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/frontend/app/administration/tag/tag-administration.component.html b/src/frontend/app/administration/tag/tag-administration.component.html
index 468586476d8..332351fd72b 100644
--- a/src/frontend/app/administration/tag/tag-administration.component.html
+++ b/src/frontend/app/administration/tag/tag-administration.component.html
@@ -47,6 +47,11 @@
<div *ngIf="!creationMode && !tag.canMerge.value" class="alert-message alert-message-danger" style="min-width: 100%;">
{{'lang.cannotMergeTags' | translate}}
</div>
+ <plugin-select-search *ngIf="!loadingTags && tag.canMerge.value && !creationMode"
+ [label]="this.translate.instant('lang.mergeTagWith')" [placeholderLabel]="this.translate.instant('lang.mergeTagWith')"
+ [formControlSelect]="selectMergeTag" [datas]="tags" (afterOpened)="getTags()"
+ (afterSelected)="mergeTag($event)" style="width:100%;">
+ </plugin-select-search>
<div class="text-center">
<button mat-raised-button [disabled]="!tagFormGroup.valid"
color="primary">{{'lang.validate' | translate}}</button>
--
GitLab