From ef241150f66ecb6cac97b41219884eb817d82a2a Mon Sep 17 00:00:00 2001
From: Mojca Lorber <mlorber@biosistemika.com>
Date: Thu, 6 Feb 2020 12:57:03 +0100
Subject: [PATCH] Fix edit tag on task page

---
 app/assets/javascripts/my_modules.js          | 10 ++++++++++
 app/views/my_module_tags/_index_edit.html.erb |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/my_modules.js b/app/assets/javascripts/my_modules.js
index cac6fcf94..b9ab0a806 100644
--- a/app/assets/javascripts/my_modules.js
+++ b/app/assets/javascripts/my_modules.js
@@ -100,7 +100,17 @@ function bindEditTagsAjax() {
       });
     manageTagsModalBody.find('.edit-tag-form')
       .on('ajax:success', function(e, data) {
+        var newTag;
         initTagsModalBody(data);
+        dropdownSelector.removeValue('#module-tags-selector', this.dataset.tagId, '', true);
+        newTag = $('#manage-module-tags-modal .list-group-item[data-tag-id=' + this.dataset.tagId + ']');
+        dropdownSelector.addValue('#module-tags-selector', {
+          value: newTag.data('tag-id'),
+          label: newTag.data('name'),
+          params: {
+            color: newTag.data('color')
+          }
+        }, true);
       })
       .on('ajax:error', function(e, data) {
         $(this).renderFormErrors('tag', data.responseJSON);
diff --git a/app/views/my_module_tags/_index_edit.html.erb b/app/views/my_module_tags/_index_edit.html.erb
index 6f698cbc0..acb7c1e48 100644
--- a/app/views/my_module_tags/_index_edit.html.erb
+++ b/app/views/my_module_tags/_index_edit.html.erb
@@ -27,7 +27,7 @@
         </div>
 
         <div class="row tag-edit" style="display: none;">
-          <%= bootstrap_form_for tag, remote: true, url: project_tag_path(@my_module.experiment.project, tag, format: :json), method: :put, html: { class: "edit-tag-form" } do |f| %>
+          <%= bootstrap_form_for tag, remote: true, url: project_tag_path(@my_module.experiment.project, tag, format: :json), method: :put, html: { class: "edit-tag-form" }, data: {tag_id: tag.id} do |f| %>
             <%= hidden_field_tag :my_module_id, @my_module.id %>
             <div class="col-xs-7">
               <%= f.text_field :name, hide_label: true %>