From 7dcbe20a8e49cc52177d2b3d802ebe549f2c4278 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Tue, 29 Nov 2016 11:26:04 +0100
Subject: [PATCH] feature #556, adapt checks to new design

---
 admin/themes/default/template/tags.tpl | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/admin/themes/default/template/tags.tpl b/admin/themes/default/template/tags.tpl
index 0e7bb44cb..871515a32 100644
--- a/admin/themes/default/template/tags.tpl
+++ b/admin/themes/default/template/tags.tpl
@@ -40,13 +40,6 @@ jQuery("#mergeTags label").click(function() {
   displayDeletionWarnings();
 });
 
-jQuery("input[name=merge]").click(function() {
-  if (jQuery("ul.tagSelection input[type=checkbox]:checked").length < 2) {
-    alert("{'Select at least two tags for merging'|@translate}");
-    return false;
-  }
-});
-
 $("#searchInput").on("keydown", function(e) {
   var $this = $(this),
       timer = $this.data("timer");
@@ -133,6 +126,14 @@ jQuery("form").submit(function() {
       return false;
     }
   }
+
+  if (jQuery("select[name=selectAction]").val() == "merge") {
+    if (jQuery("ul.tagSelection input[type=checkbox]:checked").length < 2) {
+      alert("{'Select at least two tags for merging'|@translate}");
+      return false;
+    }
+  }
+
   /* return false; */
 });