scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-12-09 21:56:32 +08:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
FIX: Tag modal opens in experiment table view [SCI-7814]
This commit is contained in:
artoscinote 2023-02-06 11:14:13 +01:00 • committed by GitHub
commit 4405fa2cd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 41 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/views/canvas/full_zoom/_my_module.html.erb
View file

@ -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) %>">
<%= render partial: "canvas/tags.html.erb", locals: { my_module: my_module } %>
</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">

6
app/views/canvas/medium_zoom/_my_module.html.erb
View file

@ -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) %>">
<%= render partial: "canvas/tags.html.erb", locals: { my_module: my_module } %>
</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">

4
app/views/my_module_tags/_index_edit.html.erb
View file

@ -12,6 +12,7 @@
<h4><%= tag.name %></h4>
</div>
<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,6 +25,7 @@
<span class="fas fa-trash-alt"></span>
<% end %>
<% end %>
<% end %>
</div>
</div>
@ -50,6 +52,7 @@
</ul>
<% end %>
<% if can_manage_my_module?(@my_module) %>
<hr data-view-mode="active">
<div class="row" data-view-mode="active">
<%= bootstrap_form_for [@my_module, @new_mmt], remote: true, format: :json, html: { class: 'add-tag-form' } do |f| %>
@ -81,3 +84,4 @@
<% end %>
</div>
</div>
<% end %>