From 9a7ffb0645ee78a8d50cd9c26bbf4cd0506e171c Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Thu, 10 Dec 2020 15:18:31 +0100 Subject: [PATCH] Add Tags modal to archived tags screen [SCI-5274] --- app/assets/javascripts/projects/canvas.js.erb | 19 +++++++++++++----- app/assets/stylesheets/my_modules.scss | 7 +++++++ app/controllers/my_module_tags_controller.rb | 4 ++-- .../canvas/full_zoom/_my_module.html.erb | 20 +++++++++++++------ app/views/experiments/module_archive.html.erb | 6 ++++++ app/views/my_module_tags/_index_edit.html.erb | 6 +++--- 6 files changed, 46 insertions(+), 16 deletions(-) diff --git a/app/assets/javascripts/projects/canvas.js.erb b/app/assets/javascripts/projects/canvas.js.erb index e289c9f38..69abee226 100644 --- a/app/assets/javascripts/projects/canvas.js.erb +++ b/app/assets/javascripts/projects/canvas.js.erb @@ -138,11 +138,16 @@ var hammertime; * Initializes page */ function init() { - bindModeChange(); - bindAjax(); - bindWindowResizeEvent(); - initializeGraph(".diagram .module-large"); - initializeFullZoom(); + if($('#module-archive').length) { + bindFullZoomAjaxTabs(); + bindEditTagsAjax($("div.module-large")); + } else { + bindModeChange(); + bindAjax(); + bindWindowResizeEvent(); + initializeGraph(".diagram .module-large"); + initializeFullZoom(); + } } jsPlumb.ready(function () { @@ -2953,5 +2958,9 @@ var preventCanvasReloadOnSave = (function() { }) } + function initArchivedView() { + + } + return function() { bindToCanvasSave(preventCanvasReload) }; })(); diff --git a/app/assets/stylesheets/my_modules.scss b/app/assets/stylesheets/my_modules.scss index 3ca37f34e..947ddc76a 100644 --- a/app/assets/stylesheets/my_modules.scss +++ b/app/assets/stylesheets/my_modules.scss @@ -242,6 +242,13 @@ .nav { border: 0; } + + .tab-content { + background-color: $color-concrete; + .tab-pane > .text-center { + margin-top: 5px; + } + } } } } diff --git a/app/controllers/my_module_tags_controller.rb b/app/controllers/my_module_tags_controller.rb index 80e274f37..339d08286 100644 --- a/app/controllers/my_module_tags_controller.rb +++ b/app/controllers/my_module_tags_controller.rb @@ -2,8 +2,8 @@ class MyModuleTagsController < ApplicationController include InputSanitizeHelper before_action :load_vars, except: :canvas_index - before_action :check_view_permissions, only: :index - before_action :check_manage_permissions, only: %i(create index_edit destroy destroy_by_tag_id) + before_action :check_view_permissions, only: %i(index index_edit) + before_action :check_manage_permissions, only: %i(create destroy destroy_by_tag_id) def index_edit @my_module_tags = @my_module.my_module_tags.order(:id) diff --git a/app/views/canvas/full_zoom/_my_module.html.erb b/app/views/canvas/full_zoom/_my_module.html.erb index 83163a772..876361218 100644 --- a/app/views/canvas/full_zoom/_my_module.html.erb +++ b/app/views/canvas/full_zoom/_my_module.html.erb @@ -12,15 +12,23 @@ data-module-users-tab-url="<%= index_old_my_module_user_my_modules_url(my_module_id: my_module.id, format: :json) %>" data-module-tags-url="<%= my_module_tags_experiment_path(my_module.experiment, format: :json) %>"> - <% if can_manage_module?(my_module) %> +
+ <% if can_manage_module?(my_module) %> + + <%= render partial: "canvas/tags.html.erb", locals: { my_module: my_module } %> + + <% else %> + + <%= render partial: "canvas/tags.html.erb", locals: { my_module: my_module } %> + + <% end %> +
+ +
<%= render partial: "canvas/tags.html.erb", locals: { my_module: my_module } %> - <% else %> - - <%= render partial: "canvas/tags.html.erb", locals: { my_module: my_module } %> - - <% end %> +

diff --git a/app/views/experiments/module_archive.html.erb b/app/views/experiments/module_archive.html.erb index c69ccacdf..eb473424a 100644 --- a/app/views/experiments/module_archive.html.erb +++ b/app/views/experiments/module_archive.html.erb @@ -23,4 +23,10 @@

<% end %> + + + <%= render partial: "my_modules/modals/manage_module_tags_modal", locals: { my_module: nil } %> + + +<%= javascript_include_tag("projects/canvas") %> diff --git a/app/views/my_module_tags/_index_edit.html.erb b/app/views/my_module_tags/_index_edit.html.erb index d871f2f71..18f742db1 100644 --- a/app/views/my_module_tags/_index_edit.html.erb +++ b/app/views/my_module_tags/_index_edit.html.erb @@ -10,7 +10,7 @@

<%= tag.name %>

-
+
<%= link_to "", remote: true, class: 'btn btn-link edit-tag-link', title: t("experiments.canvas.modal_manage_tags.edit_tag") do %> <% end %> @@ -49,8 +49,8 @@ <% end %> -
-
+
+
<%= bootstrap_form_for [@my_module, @new_mmt], remote: true, format: :json, html: { class: 'add-tag-form' } do |f| %>