Merge pull request #4913 from sboursen-scinote/sb_SCI-7814

FIX: Tag modal opens in experiment table view [SCI-7814]

app/views/canvas/full_zoom/_my_module.html.erb

@@ -13,15 +13,9 @@
   data-module-tags-url="<%= my_module_tags_experiment_path(my_module.experiment, format: :json) %>">
 
   <div data-view-mode="active">
-    <% if can_manage_my_module?(my_module) %>
+    <a class="edit-tags-link pull-right" data-remote="true" href="<%= my_module_tags_edit_url(my_module, format: :json) %>">
-      <a class="edit-tags-link pull-right" data-remote="true" href="<%= my_module_tags_edit_url(my_module, format: :json) %>">
+      <%= render partial: "canvas/tags.html.erb", locals: { my_module: my_module } %>
-        <%= render partial: "canvas/tags.html.erb", locals: { my_module: my_module } %>
+    </a>
-      </a>
-    <% else %>
-      <span class="edit-tags-link pull-right">
-        <%= render partial: "canvas/tags.html.erb", locals: { my_module: my_module } %>
-      </span>
-    <% end %>
   </div>
 
   <div data-view-mode="archived">

app/views/canvas/medium_zoom/_my_module.html.erb

@@ -10,15 +10,9 @@
   data-module-y="<%= my_module.y %>"
   data-module-conns="<%= construct_module_connections(my_module) %>">
 
-  <% if can_manage_my_module?(my_module) %>
+  <a class="edit-tags-link pull-right" data-remote="true" href="<%= my_module_tags_edit_url(my_module, format: :json) %>">
-    <a class="edit-tags-link pull-right" data-remote="true" href="<%= my_module_tags_edit_url(my_module, format: :json) %>">
+    <%= render partial: "canvas/tags.html.erb", locals: { my_module: my_module } %>
-      <%= render partial: "canvas/tags.html.erb", locals: { my_module: my_module } %>
+  </a>
-    </a>
-  <% else %>
-    <span class="edit-tags-link pull-right">
-      <%= render partial: "canvas/tags.html.erb", locals: { my_module: my_module } %>
-    </span>
-  <% end %>
 
   <div class="panel-heading">
     <h3 class="panel-title">

app/views/my_module_tags/_index_edit.html.erb

@@ -11,7 +11,8 @@
           <div class="col-xs-6 col-lg-8">
             <h4><%= tag.name %></h4>
           </div>
-            <div class="pull-right" data-view-mode="active">
+          <div class="pull-right" data-view-mode="active">
+            <% if can_manage_my_module?(@my_module) %>
               <%= link_to "", remote: true, class: 'btn btn-link edit-tag-link', title: t("experiments.canvas.modal_manage_tags.edit_tag") do %>
                 <span class="fas fa-pencil-alt"></span>
               <% end %>
@@ -24,7 +25,8 @@
                   <span class="fas fa-trash-alt"></span>
                 <% end %>
               <% end %>
-            </div>
+            <% end %>
+          </div>
         </div>
 
         <div class="row tag-edit" style="display: none;">
@@ -50,34 +52,36 @@
   </ul>
 <% end %>
 
-<hr data-view-mode="active">
+<% if can_manage_my_module?(@my_module) %>
-<div class="row" data-view-mode="active">
+  <hr data-view-mode="active">
-    <%= bootstrap_form_for [@my_module, @new_mmt], remote: true, format: :json, html: { class: 'add-tag-form' } do |f| %>
+  <div class="row" data-view-mode="active">
-      <div>
+      <%= bootstrap_form_for [@my_module, @new_mmt], remote: true, format: :json, html: { class: 'add-tag-form' } do |f| %>
-        <div class="well well-sm">
+        <div>
-          <%= collection_select(:my_module_tag,
+          <div class="well well-sm">
-                                :tag_id,
+            <%= collection_select(:my_module_tag,
-                                @unassigned_tags.collect{ |t| t.name = t.name.truncate(Constants::DROPDOWN_TEXT_MAX_LENGTH, omission: '...'); t },
+                                  :tag_id,
-                                :id,
+                                  @unassigned_tags.collect{ |t| t.name = t.name.truncate(Constants::DROPDOWN_TEXT_MAX_LENGTH, omission: '...'); t },
-                                :name,
+                                  :id,
-                                {},
+                                  :name,
-                                { class: 'selectpicker' }) %>
+                                  {},
-          <%= f.button class: 'btn btn-primary' do %>
+                                  { class: 'selectpicker' }) %>
-            <span><%= t("experiments.canvas.modal_manage_tags.create") %></span>
+            <%= f.button class: 'btn btn-primary' do %>
-          <% end %>
+              <span><%= t("experiments.canvas.modal_manage_tags.create") %></span>
+            <% end %>
+          </div>
         </div>
-      </div>
-    <% end %>
-    <div class="pull-right create-new-tag-btn">
-      <%= bootstrap_form_for [@my_module.experiment.project, @new_tag], remote: true, format: :json, html: { class: 'add-tag-form' } do |f| %>
-        <%= hidden_field_tag :my_module_id, @my_module.id %>
-        <%= f.hidden_field :project_id, :value => @my_module.experiment.project.id %>
-        <%= f.hidden_field :name, :value => t("tags.create.new_name") %>
-        <%= f.hidden_field :color, :value => Constants::TAG_COLORS[0] %>
-        <%= f.button class: "btn btn-primary" do %>
-          <span class="fas fa-plus"></span>
-          <span class="hidden-xs"><%=t "experiments.canvas.modal_manage_tags.create_new" %></span>
-        <% end %>
       <% end %>
-    </div>
+      <div class="pull-right create-new-tag-btn">
-</div>
+        <%= bootstrap_form_for [@my_module.experiment.project, @new_tag], remote: true, format: :json, html: { class: 'add-tag-form' } do |f| %>
+          <%= hidden_field_tag :my_module_id, @my_module.id %>
+          <%= f.hidden_field :project_id, :value => @my_module.experiment.project.id %>
+          <%= f.hidden_field :name, :value => t("tags.create.new_name") %>
+          <%= f.hidden_field :color, :value => Constants::TAG_COLORS[0] %>
+          <%= f.button class: "btn btn-primary" do %>
+            <span class="fas fa-plus"></span>
+            <span class="hidden-xs"><%=t "experiments.canvas.modal_manage_tags.create_new" %></span>
+          <% end %>
+        <% end %>
+      </div>
+  </div>
+<% end %>