From 68ebf13bca0250aa53cad8beb726c7f227225c5a Mon Sep 17 00:00:00 2001
From: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com>
Date: Tue, 2 Jul 2019 11:20:49 +0200
Subject: [PATCH] Fix tags modal issue (#1856)

---
 app/assets/javascripts/my_modules.js           | 4 ++--
 app/assets/javascripts/my_modules/protocols.js | 3 +--
 app/assets/javascripts/projects/canvas.js.erb  | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/my_modules.js b/app/assets/javascripts/my_modules.js
index 13cd2b826..6b93043c1 100644
--- a/app/assets/javascripts/my_modules.js
+++ b/app/assets/javascripts/my_modules.js
@@ -109,8 +109,8 @@ function bindEditTagsAjax() {
   function initAddTagForm() {
     manageTagsModalBody.find('.add-tag-form')
       .submit(function() {
-        var selectOptions = manageTagsModalBody.find('.add-tag-form .dropdown-menu li').length;
-        if (selectOptions === 0) return false;
+        var selectOptions = manageTagsModalBody.find('#new_my_module_tag .dropdown-menu li').length;
+        if (selectOptions === 0 && this.id === 'new_my_module_tag') return false;
         return true;
       })
       .on('ajax:success', function(e, data) {
diff --git a/app/assets/javascripts/my_modules/protocols.js b/app/assets/javascripts/my_modules/protocols.js
index fbaa091dc..56fe44e6e 100644
--- a/app/assets/javascripts/my_modules/protocols.js
+++ b/app/assets/javascripts/my_modules/protocols.js
@@ -450,8 +450,7 @@ function initRecentProtocols() {
     });
   });
 
-  // We use here ajax:success, because we want to check any change on this page
-  $(document).on('ajax:success', () => {
+  $('.protocol-description-content').on('ajax:success', () => {
     updateRecentProtocolsStatus();
   });
 }
diff --git a/app/assets/javascripts/projects/canvas.js.erb b/app/assets/javascripts/projects/canvas.js.erb
index 49d21437c..12c662a1b 100644
--- a/app/assets/javascripts/projects/canvas.js.erb
+++ b/app/assets/javascripts/projects/canvas.js.erb
@@ -797,8 +797,8 @@ function bindEditTagsAjax(elements) {
   function initAddTagForm() {
     manageTagsModalBody.find(".add-tag-form")
       .submit(function() {
-        var selectOptions = manageTagsModalBody.find('.add-tag-form .dropdown-menu li').length;
-        if (selectOptions === 0) return false;
+        var selectOptions = manageTagsModalBody.find('#new_my_module_tag .dropdown-menu li').length;
+        if (selectOptions === 0 && this.id == 'new_my_module_tag') return false;
         return true;
       })
       .on("ajax:success", function (e, data) {