From a17106b88373877fef724b64aa6bc75e8ab64a4f Mon Sep 17 00:00:00 2001 From: zmagod Date: Wed, 27 Jul 2016 16:18:26 +0200 Subject: [PATCH 01/11] added experiments controller and fixed sidebar --- app/controllers/experiments_controller.rb | 70 +++++++++++++++++++++ app/views/shared/_sidebar.html.erb | 68 ++------------------ app/views/shared/_sidebar_elements.html.erb | 64 +++++++++++++++++++ 3 files changed, 139 insertions(+), 63 deletions(-) create mode 100644 app/controllers/experiments_controller.rb create mode 100644 app/views/shared/_sidebar_elements.html.erb diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb new file mode 100644 index 000000000..55950c26c --- /dev/null +++ b/app/controllers/experiments_controller.rb @@ -0,0 +1,70 @@ +class ExperimentsController < ApplicationController + include PermissionHelper + before_action :set_experiment, except: [:new, :create] + before_action :set_project, only: [:new, :create] + + def new + @experiment = Experiment.new + end + + def create + @experiment = Experiment.new(experiment_params) + @experiment.created_by = current_user + # @experiment.last_modified_by = current_user + if @experiment.save + @project.experiments << @experiment + flash[:success] = t('experiments.create.success_flash', name: @experiment.name) + respond_to do |format| + format.json{} + end + else + flash[:danger] = t('experiments.create.error_flash', name: @experiment.name) + render :new + end + end + + def edit + end + + def update + @experiment.update_attributes(experiment_params) + @experiment.last_modified_by = current_user + if @experiment.save + flash[:success] = t('experiments.update.success_flash', name: @experiment.name) + respond_to do |format| + format.json{} + end + else + flash[:danger] = t('experiments.create.error_flash', name: @experiment.name) + render :edit + end + end + + def archive_experiment + @experiment.archived = true + @experiment.archived_by = current_user + @experiment.archived_on = DateTime.now + if @experiment.save + flash[:success] = t('experiments.archive.success_flash', name: @experiment.name) + respond_to do |format| + format.json{} + end + else + flash[:danger] = t('experiments.archive.error_flash', name: @experiment.name) + end + end + + private + + def set_experiment + @experiment = Experiment.find_by_id(params[:id]) + end + + def set_project + @project = Project.find_by_id(params[:project_id]) + end + + def experiment_params + params.require(:experiment).permit(:name, :description, :archived) + end +end diff --git a/app/views/shared/_sidebar.html.erb b/app/views/shared/_sidebar.html.erb index e66a0eb67..8d7d4e779 100644 --- a/app/views/shared/_sidebar.html.erb +++ b/app/views/shared/_sidebar.html.erb @@ -23,71 +23,13 @@ <%= @project.name %> <% end %> - <% if @project.active_modules.present? then %> - + <% @experiments.each do |experiment| %> + <%= render 'shared/sidebar_elements' %> <% end %> +
  • + New experiment... +
    • diff --git a/app/views/shared/_sidebar_elements.html.erb b/app/views/shared/_sidebar_elements.html.erb new file mode 100644 index 000000000..19441126f --- /dev/null +++ b/app/views/shared/_sidebar_elements.html.erb @@ -0,0 +1,64 @@ +<% if experiment.active_modules.present? then %> + +<% end %> From 54c405190631dbc94b536e06f9716b58873e611f Mon Sep 17 00:00:00 2001 From: zmagod Date: Thu, 28 Jul 2016 09:01:44 +0200 Subject: [PATCH 02/11] added canvas under experiments --- app/controllers/canvas_controller.rb | 2 +- app/controllers/experiments_controller.rb | 3 +- app/helpers/permission_helper.rb | 4 +- .../canvas/full_zoom/_my_module.html.erb | 2 +- app/views/experiments/canvas.html.erb | 39 +++++++++++++++++++ app/views/shared/_sidebar.html.erb | 11 ++++-- app/views/shared/_sidebar_elements.html.erb | 6 +-- config/locales/en.yml | 2 - config/routes.rb | 19 +++++---- 9 files changed, 67 insertions(+), 21 deletions(-) create mode 100644 app/views/experiments/canvas.html.erb diff --git a/app/controllers/canvas_controller.rb b/app/controllers/canvas_controller.rb index c07e59ad3..7259ebe60 100644 --- a/app/controllers/canvas_controller.rb +++ b/app/controllers/canvas_controller.rb @@ -265,7 +265,7 @@ class CanvasController < ApplicationController end def check_edit_canvas - unless can_edit_canvas(@experiment) + unless can_edit_canvas(@project) render_403 and return end end diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb index 55950c26c..1ca6f62e6 100644 --- a/app/controllers/experiments_controller.rb +++ b/app/controllers/experiments_controller.rb @@ -23,7 +23,8 @@ class ExperimentsController < ApplicationController end end - def edit + def canvas + @project = @experiment.project end def update diff --git a/app/helpers/permission_helper.rb b/app/helpers/permission_helper.rb index 798e5d779..6aa449422 100644 --- a/app/helpers/permission_helper.rb +++ b/app/helpers/permission_helper.rb @@ -323,8 +323,8 @@ module PermissionHelper # ---- WORKFLOW PERMISSIONS ---- - def can_edit_canvas(experiment) - is_user_or_higher_of_project(experiment.project) + def can_edit_canvas(project) + is_user_or_higher_of_project(project) end def can_reposition_modules(experiment) diff --git a/app/views/canvas/full_zoom/_my_module.html.erb b/app/views/canvas/full_zoom/_my_module.html.erb index 11c46ec2c..e9c985506 100644 --- a/app/views/canvas/full_zoom/_my_module.html.erb +++ b/app/views/canvas/full_zoom/_my_module.html.erb @@ -32,7 +32,7 @@
    - <%= link_to_if can_edit_module(my_module), t("experiments.canvas.full_zoom.due_date"), due_date_my_module_path(my_module, format: :json), remote: true, class: "due-date-link" %> + <%= link_to_if can_edit_module(my_module), t("projects.canvas.full_zoom.due_date"), due_date_my_module_path(my_module, format: :json), remote: true, class: "due-date-link" %>
    <% if can_edit_module(my_module) %> diff --git a/app/views/experiments/canvas.html.erb b/app/views/experiments/canvas.html.erb new file mode 100644 index 000000000..c8885e52e --- /dev/null +++ b/app/views/experiments/canvas.html.erb @@ -0,0 +1,39 @@ +<% provide(:head_title, raw(t("projects.canvas.head_title", project: @project.name))) %> +<%= render partial: "shared/sidebar" %> +<%= render partial: "shared/secondary_navigation" %> + +
    + <% if can_edit_canvas(@project) %> + <%=link_to t("projects.canvas.canvas_edit"), canvas_edit_experiment_url(@experiment), remote: true, type: "button", id: "edit-canvas-button", class: "ajax btn btn-default", "data-action" => "edit" %> + <% end %> +
    + <%=link_to canvas_full_zoom_experiment_path(@experiment), remote: true, type: "button", class: "ajax btn btn-primary active", "data-action" => "full_zoom", "data-toggle" => "button", "aria-pressed" => true do %> + + <% end %> + <%=link_to canvas_medium_zoom_experiment_path(@experiment), remote: true, type: "button", class: "ajax btn btn-primary", "data-action" => "medium_zoom" do %> + + <% end %> + <%=link_to canvas_small_zoom_experiment_path(@experiment), remote: true, type: "button", class: "ajax btn btn-primary", "data-action" => "small_zoom" do %> + + <% end %> +
    +
    +
    + <%= render partial: 'canvas/full_zoom', locals: { project: @project, experiment: @experiment, my_modules: @experiment.active_modules } %> +
    + + +<%= render partial: "my_modules/modals/manage_module_tags_modal", locals: { my_module: nil } %> + + +<%= javascript_include_tag("jsPlumb-2.0.4-min") %> +<%= javascript_include_tag("jsnetworkx") %> +<%= javascript_include_tag("eventPause-min") %> + +<%= javascript_include_tag("projects/canvas") %> diff --git a/app/views/shared/_sidebar.html.erb b/app/views/shared/_sidebar.html.erb index 8d7d4e779..5d510b825 100644 --- a/app/views/shared/_sidebar.html.erb +++ b/app/views/shared/_sidebar.html.erb @@ -23,9 +23,14 @@ <%= @project.name %> <% end %> - <% @experiments.each do |experiment| %> - <%= render 'shared/sidebar_elements' %> - <% end %> +
      +
    • + + + <%= @experiment.name %> + + <%= render 'shared/sidebar_elements' %> +
  • New experiment... diff --git a/app/views/shared/_sidebar_elements.html.erb b/app/views/shared/_sidebar_elements.html.erb index 19441126f..06fab15a8 100644 --- a/app/views/shared/_sidebar_elements.html.erb +++ b/app/views/shared/_sidebar_elements.html.erb @@ -1,6 +1,6 @@ -<% if experiment.active_modules.present? then %> +<% if @experiment.active_modules.present? then %>
      - <% experiment.active_module_groups.each do |my_module_group| %> + <% @experiment.active_module_groups.each do |my_module_group| %>
    • @@ -35,7 +35,7 @@ <% end %>
      • <% end %> - <% modules_without_group = experiment.modules_without_group %> + <% modules_without_group = @experiment.modules_without_group %> <% if modules_without_group.present? then %>
    • diff --git a/config/locales/en.yml b/config/locales/en.yml index 4dabda6ce..01181d3b6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -376,8 +376,6 @@ en: restore_option: "Restore" archived_on: "Archived on" archived_on_title: "Task archived on %{date} at %{time}." - - experiments: canvas: head_title: "%{project} | Overview" canvas_edit: "Edit workflow" diff --git a/config/routes.rb b/config/routes.rb index 11b5c2db5..9ec7bbcbe 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -88,13 +88,18 @@ Rails.application.routes.draw do post 'destroy', as: :destroy # Destroy multiple entries at once end end + resources :experiments, only: [:new, :create, :edit, :update, :archive] + resources :experiments, shallow: true, only: [:show] do + member do + get 'canvas' # Overview/structure for single project + get 'canvas/edit', to: 'canvas#edit' # AJAX-loaded canvas edit mode (from canvas) + get 'canvas/full_zoom', to: 'canvas#full_zoom' # AJAX-loaded canvas zoom + get 'canvas/medium_zoom', to: 'canvas#medium_zoom' # AJAX-loaded canvas zoom + get 'canvas/small_zoom', to: 'canvas#small_zoom' # AJAX-loaded canvas zoom + post 'canvas', to: 'canvas#update' # Save updated canvas action + end + end member do - get 'canvas' # Overview/structure for single project - get 'canvas/edit', to: 'canvas#edit' # AJAX-loaded canvas edit mode (from canvas) - get 'canvas/full_zoom', to: 'canvas#full_zoom' # AJAX-loaded canvas zoom - get 'canvas/medium_zoom', to: 'canvas#medium_zoom' # AJAX-loaded canvas zoom - get 'canvas/small_zoom', to: 'canvas#small_zoom' # AJAX-loaded canvas zoom - post 'canvas', to: 'canvas#update' # Save updated canvas action get 'notifications' # Notifications popup for individual project in projects index get 'samples' # Samples for single project get 'module_archive' # Module archive for single project @@ -106,8 +111,6 @@ Rails.application.routes.draw do get 'users/edit', to: 'user_projects#index_edit' end - resources :experiments, only: [:show] - # Show action is a popup (JSON) for individual module in full-zoom canvas, # as well as "module info" page for single module (HTML) resources :my_modules, path: "/modules", only: [:show, :edit, :update, :destroy] do From d16c0fe7063f88deece111026073a60aecaf8905 Mon Sep 17 00:00:00 2001 From: zmagod Date: Thu, 28 Jul 2016 10:09:05 +0200 Subject: [PATCH 03/11] fixed edit canvas --- app/controllers/canvas_controller.rb | 13 +++---- app/helpers/permission_helper.rb | 2 +- app/models/experiment.rb | 4 +-- app/views/canvas/_edit.html.erb | 34 +++++++++---------- app/views/canvas/edit/_my_module.html.erb | 14 ++++---- .../canvas/edit/modal/_delete_module.html.erb | 6 ++-- .../edit/modal/_delete_module_group.html.erb | 6 ++-- .../canvas/edit/modal/_edit_module.html.erb | 12 +++---- .../edit/modal/_edit_module_group.html.erb | 12 +++---- .../canvas/edit/modal/_new_module.html.erb | 12 +++---- .../shared/_secondary_navigation.html.erb | 4 +-- 11 files changed, 60 insertions(+), 59 deletions(-) diff --git a/app/controllers/canvas_controller.rb b/app/controllers/canvas_controller.rb index 7259ebe60..5c2263aa0 100644 --- a/app/controllers/canvas_controller.rb +++ b/app/controllers/canvas_controller.rb @@ -1,30 +1,30 @@ class CanvasController < ApplicationController before_action :load_vars - before_action :check_view_canvas, only: [:edit, :full_zoom, :medium_zoom, :small_zoom] - before_action :check_edit_canvas, only: [:edit, :update] + # before_action :check_view_canvas, only: [:edit, :full_zoom, :medium_zoom, :small_zoom] + # before_action :check_edit_canvas, only: [:edit, :update] def edit render partial: 'canvas/edit', - locals: { experiment: @experiment, my_modules: @my_modules }, + locals: { project: @project, experiment: @experiment, my_modules: @my_modules }, :content_type => 'text/html' end def full_zoom render partial: 'canvas/full_zoom', - locals: { experiment: @experiment, my_modules: @my_modules }, + locals: { project: @project, experiment: @experiment, my_modules: @my_modules }, :content_type => 'text/html' end def medium_zoom render partial: 'canvas/medium_zoom', - locals: { experiment: @experiment, my_modules: @my_modules }, + locals: { project: @project, experiment: @experiment, my_modules: @my_modules }, :content_type => 'text/html' end def small_zoom render partial: 'canvas/small_zoom', - locals: { experiment: @experiment, my_modules: @my_modules }, + locals: { project: @project, experiment: @experiment, my_modules: @my_modules }, :content_type => 'text/html' end @@ -254,6 +254,7 @@ class CanvasController < ApplicationController def load_vars @experiment = Experiment.find_by_id(params[:id]) + @project = @experiment.project unless @experiment respond_to do |format| format.html { render_404 and return } diff --git a/app/helpers/permission_helper.rb b/app/helpers/permission_helper.rb index 6aa449422..c134b182c 100644 --- a/app/helpers/permission_helper.rb +++ b/app/helpers/permission_helper.rb @@ -366,7 +366,7 @@ module PermissionHelper end def can_archive_module(my_module) - is_user_or_higher_of_project(my_module.project) + is_user_or_higher_of_project(my_module.experiment.project) end def can_restore_module(my_module) diff --git a/app/models/experiment.rb b/app/models/experiment.rb index 1fb7c370a..1aefe5f3f 100644 --- a/app/models/experiment.rb +++ b/app/models/experiment.rb @@ -131,7 +131,7 @@ class Experiment < ActiveRecord::Base Activity.create( type_of: :create_module, user: current_user, - project: selfproject, + project: self.project, my_module: m, message: I18n.t( "activities.create_module", @@ -489,7 +489,7 @@ class Experiment < ActiveRecord::Base if w.length > 1 group = MyModuleGroup.new( name: wf_names[i], - project: self, + experiment: self, my_modules: MyModule.find(w)) group.created_by = current_user group.save! diff --git a/app/views/canvas/_edit.html.erb b/app/views/canvas/_edit.html.erb index 167d13537..4cd74b2e9 100644 --- a/app/views/canvas/_edit.html.erb +++ b/app/views/canvas/_edit.html.erb @@ -6,16 +6,16 @@ data-can-delete-modules="<%= can_archive_modules(@experiment) ? "yes" : "no" %>" data-can-reposition-modules="<%= can_reposition_modules(@experiment) ? "yes" : "no" %>" data-can-edit-connections="<%= can_edit_connections(@experiment) ? "yes" : "no" %>" - data-unsaved-work-text="<%=t "experiments.canvas.edit.unsaved_work" %>" + data-unsaved-work-text="<%=t "projects.canvas.edit.unsaved_work" %>" > - <%= bootstrap_form_tag url: canvas_project_url, method: "post" do |f| %> + <%= bootstrap_form_tag url: canvas_experiment_url, method: "post" do |f| %>
      <%= f.submit class: "btn btn-primary", id: "canvas-save" do %> - <%= t("experiments.canvas.edit.save_short") %> - + <%= t("projects.canvas.edit.save_short") %> + <% end %> - <%= link_to canvas_project_path(@project), type: "button", class: "btn btn-default cancel-edit-canvas" do %> - + <%= link_to canvas_experiment_path(@experiment), type: "button", class: "btn btn-default cancel-edit-canvas" do %> +   <% end %>
      @@ -23,12 +23,12 @@ <%=link_to "", type: "button", class: "btn btn-default", id: "canvas-new-module" do %> - <%= t("experiments.canvas.edit.new_module") %> + <%= t("projects.canvas.edit.new_module") %> - - <%= t("experiments.canvas.edit.new_module") %> + + <%= t("projects.canvas.edit.new_module") %> <% end %> <% end %> @@ -42,28 +42,28 @@ <%= hidden_field_tag 'module-groups', '{}' %> <% end %>
    • diff --git a/app/views/canvas/edit/_my_module.html.erb b/app/views/canvas/edit/_my_module.html.erb index c9670ce93..bfaae0f62 100644 --- a/app/views/canvas/edit/_my_module.html.erb +++ b/app/views/canvas/edit/_my_module.html.erb @@ -23,30 +23,30 @@
  • <%= t('projects.index.options_header') %>
    • <% if can_edit_module(my_module) %>
  • - <%=t "experiments.canvas.edit.edit_module" %> + <%=t "projects.canvas.edit.edit_module" %>
    • <% end %> <% if can_edit_module_groups(my_module.experiment) %>
  • > - <%=t "experiments.canvas.edit.edit_module_group" %> + <%=t "projects.canvas.edit.edit_module_group" %>
    • <% end %> <% if can_clone_modules(my_module.experiment) %>
  • - <%=t "experiments.canvas.edit.clone_module" %> + <%=t "projects.canvas.edit.clone_module" %>
  • > - <%=t "experiments.canvas.edit.clone_module_group" %> + <%=t "projects.canvas.edit.clone_module_group" %>
    • <% end %> <% if can_archive_module(my_module) %>
  • - <%=t "experiments.canvas.edit.delete_module" %> + <%=t "projects.canvas.edit.delete_module" %>
    • <% end %> <% if can_archive_modules(my_module.experiment) %>
  • > - <%=t "experiments.canvas.edit.delete_module_group" %> + <%=t "projects.canvas.edit.delete_module_group" %>
    • <% end %> @@ -56,7 +56,7 @@ <% if can_edit_connections(my_module.experiment) %>
    - <%=t "experiments.canvas.edit.drag_connections" %> + <%=t "projects.canvas.edit.drag_connections" %>
    <% end %> diff --git a/app/views/canvas/edit/modal/_delete_module.html.erb b/app/views/canvas/edit/modal/_delete_module.html.erb index 90a4b58da..dc9e57043 100644 --- a/app/views/canvas/edit/modal/_delete_module.html.erb +++ b/app/views/canvas/edit/modal/_delete_module.html.erb @@ -3,15 +3,15 @@
    - +
    - +
    - +
    diff --git a/app/views/canvas/edit/modal/_delete_module_group.html.erb b/app/views/canvas/edit/modal/_delete_module_group.html.erb index 9d6e82f2a..8e8b03b7a 100644 --- a/app/views/canvas/edit/modal/_delete_module_group.html.erb +++ b/app/views/canvas/edit/modal/_delete_module_group.html.erb @@ -3,15 +3,15 @@
    - +
    - +
    - +
    diff --git a/app/views/canvas/edit/modal/_edit_module.html.erb b/app/views/canvas/edit/modal/_edit_module.html.erb index 6f4c6b091..f1ae36479 100644 --- a/app/views/canvas/edit/modal/_edit_module.html.erb +++ b/app/views/canvas/edit/modal/_edit_module.html.erb @@ -3,25 +3,25 @@
    - +
    <%= bootstrap_form_tag do |f| %> - <%= f.text_field t("experiments.canvas.edit.modal_edit_module.name"), id: "edit-module-name-input" %> + <%= f.text_field t("projects.canvas.edit.modal_edit_module.name"), id: "edit-module-name-input" %> <% end %>
    - +
    diff --git a/app/views/canvas/edit/modal/_edit_module_group.html.erb b/app/views/canvas/edit/modal/_edit_module_group.html.erb index f8f576453..cbdf51fd6 100644 --- a/app/views/canvas/edit/modal/_edit_module_group.html.erb +++ b/app/views/canvas/edit/modal/_edit_module_group.html.erb @@ -3,25 +3,25 @@
    - +
    <%= bootstrap_form_tag do |f| %> - <%= f.text_field t("experiments.canvas.edit.modal_edit_module_group.name"), id: "edit-module-group-name-input" %> + <%= f.text_field t("projects.canvas.edit.modal_edit_module_group.name"), id: "edit-module-group-name-input" %> <% end %>
    - +
    diff --git a/app/views/canvas/edit/modal/_new_module.html.erb b/app/views/canvas/edit/modal/_new_module.html.erb index 42059ad01..9c70387b4 100644 --- a/app/views/canvas/edit/modal/_new_module.html.erb +++ b/app/views/canvas/edit/modal/_new_module.html.erb @@ -3,25 +3,25 @@
    - +
    <%= bootstrap_form_tag do |f| %> - <%= f.text_field t("experiments.canvas.edit.modal_new_module.name"), placeholder: t("experiments.canvas.edit.modal_new_module.name_placeholder"), id: "new-module-name-input" %> + <%= f.text_field t("projects.canvas.edit.modal_new_module.name"), placeholder: t("projects.canvas.edit.modal_new_module.name_placeholder"), id: "new-module-name-input" %> <% end %>
    - +
    diff --git a/app/views/shared/_secondary_navigation.html.erb b/app/views/shared/_secondary_navigation.html.erb index 47e32d570..826f2c5dd 100644 --- a/app/views/shared/_secondary_navigation.html.erb +++ b/app/views/shared/_secondary_navigation.html.erb @@ -17,7 +17,7 @@
  • <% end %> <% if can_view_project(@project) %> - + <% end %> <%= @project.name %> <% if can_view_project(@project) %> @@ -150,7 +150,7 @@
  • <% end %> <% if can_view_project(@project) %> - + <% end %> <%= truncate( @project.name, length: 20 ) %> <% if can_view_project(@project) %> From c11932b45bc0889b736420c716fa6ca45758d0f9 Mon Sep 17 00:00:00 2001 From: zmagod Date: Thu, 28 Jul 2016 11:00:56 +0200 Subject: [PATCH 04/11] fixed layout --- app/controllers/canvas_controller.rb | 4 ++-- app/controllers/experiments_controller.rb | 7 +++++++ app/views/shared/_sidebar.html.erb | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/controllers/canvas_controller.rb b/app/controllers/canvas_controller.rb index 5c2263aa0..abc4197ed 100644 --- a/app/controllers/canvas_controller.rb +++ b/app/controllers/canvas_controller.rb @@ -1,8 +1,8 @@ class CanvasController < ApplicationController before_action :load_vars - # before_action :check_view_canvas, only: [:edit, :full_zoom, :medium_zoom, :small_zoom] - # before_action :check_edit_canvas, only: [:edit, :update] + before_action :check_view_canvas, only: [:edit, :full_zoom, :medium_zoom, :small_zoom] + before_action :check_edit_canvas, only: [:edit, :update] def edit render partial: 'canvas/edit', diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb index 1ca6f62e6..5bab96d56 100644 --- a/app/controllers/experiments_controller.rb +++ b/app/controllers/experiments_controller.rb @@ -3,6 +3,9 @@ class ExperimentsController < ApplicationController before_action :set_experiment, except: [:new, :create] before_action :set_project, only: [:new, :create] + # except parameter could be used but it is not working. + layout :choose_layout + def new @experiment = Experiment.new end @@ -68,4 +71,8 @@ class ExperimentsController < ApplicationController def experiment_params params.require(:experiment).permit(:name, :description, :archived) end + + def choose_layout + action_name.in?(['index', 'archive']) ? 'main' : 'fluid' + end end diff --git a/app/views/shared/_sidebar.html.erb b/app/views/shared/_sidebar.html.erb index 5d510b825..ba1328069 100644 --- a/app/views/shared/_sidebar.html.erb +++ b/app/views/shared/_sidebar.html.erb @@ -1,4 +1,4 @@ -<% content_for :sidebar do %> +<%= content_for :sidebar do %>
    From 9d23cfd9407eac9b221e7eab5e75c9f9f065de79 Mon Sep 17 00:00:00 2001 From: zmagod Date: Thu, 28 Jul 2016 11:30:34 +0200 Subject: [PATCH 05/11] fixed experiment routes --- app/controllers/canvas_controller.rb | 2 +- app/controllers/experiments_controller.rb | 4 ++-- app/views/projects/index/_project.html.erb | 2 +- app/views/shared/_sidebar.html.erb | 2 +- config/routes.rb | 24 ++++++++++++---------- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/app/controllers/canvas_controller.rb b/app/controllers/canvas_controller.rb index abc4197ed..92c655c8e 100644 --- a/app/controllers/canvas_controller.rb +++ b/app/controllers/canvas_controller.rb @@ -232,7 +232,7 @@ class CanvasController < ApplicationController end flash[:success] = t( - "experiments.canvas.update.success_flash") + "projects.canvas.update.success_flash") redirect_to canvas_experiment_path(@experiment) end diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb index 5bab96d56..6828f2cd8 100644 --- a/app/controllers/experiments_controller.rb +++ b/app/controllers/experiments_controller.rb @@ -5,7 +5,7 @@ class ExperimentsController < ApplicationController # except parameter could be used but it is not working. layout :choose_layout - + def new @experiment = Experiment.new end @@ -65,7 +65,7 @@ class ExperimentsController < ApplicationController end def set_project - @project = Project.find_by_id(params[:project_id]) + @project = @experiment.project end def experiment_params diff --git a/app/views/projects/index/_project.html.erb b/app/views/projects/index/_project.html.erb index b069ab79b..d46293f6a 100644 --- a/app/views/projects/index/_project.html.erb +++ b/app/views/projects/index/_project.html.erb @@ -33,7 +33,7 @@ data-project-users-tab-url="<%= url_for project_user_projects_path(project_id: p <% end %> <% if can_view_project(project) then %> - <%= link_to project.name, canvas_project_path(project), id: "#{project.id}-project-canvas-link" %> + <%#= link_to project.name, canvas_project_path(project), id: "#{project.id}-project-canvas-link" %> <% else %> <%= project.name %> <% end %> diff --git a/app/views/shared/_sidebar.html.erb b/app/views/shared/_sidebar.html.erb index ba1328069..d0bde1ade 100644 --- a/app/views/shared/_sidebar.html.erb +++ b/app/views/shared/_sidebar.html.erb @@ -24,7 +24,7 @@ <% end %>
      -
    • +
    • <%= @experiment.name %> diff --git a/config/routes.rb b/config/routes.rb index 9ec7bbcbe..2bf2bdf56 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -89,21 +89,11 @@ Rails.application.routes.draw do end end resources :experiments, only: [:new, :create, :edit, :update, :archive] - resources :experiments, shallow: true, only: [:show] do - member do - get 'canvas' # Overview/structure for single project - get 'canvas/edit', to: 'canvas#edit' # AJAX-loaded canvas edit mode (from canvas) - get 'canvas/full_zoom', to: 'canvas#full_zoom' # AJAX-loaded canvas zoom - get 'canvas/medium_zoom', to: 'canvas#medium_zoom' # AJAX-loaded canvas zoom - get 'canvas/small_zoom', to: 'canvas#small_zoom' # AJAX-loaded canvas zoom - post 'canvas', to: 'canvas#update' # Save updated canvas action - end - end member do get 'notifications' # Notifications popup for individual project in projects index get 'samples' # Samples for single project - get 'module_archive' # Module archive for single project post 'samples_index' # Renders sample datatable for single project (ajax action) + get 'experiment_archive' # Experiment archive for single project post :delete_samples, constraints: CommitParamRouting.new(MyModulesController::DELETE_SAMPLES), action: :delete_samples end @@ -111,6 +101,18 @@ Rails.application.routes.draw do get 'users/edit', to: 'user_projects#index_edit' end + resources :experiments, only: [:show] do + member do + get 'canvas' # Overview/structure for single project + get 'canvas/edit', to: 'canvas#edit' # AJAX-loaded canvas edit mode (from canvas) + get 'canvas/full_zoom', to: 'canvas#full_zoom' # AJAX-loaded canvas zoom + get 'canvas/medium_zoom', to: 'canvas#medium_zoom' # AJAX-loaded canvas zoom + get 'canvas/small_zoom', to: 'canvas#small_zoom' # AJAX-loaded canvas zoom + post 'canvas', to: 'canvas#update' # Save updated canvas action + get 'module_archive' # Module archive for single project + end + end + # Show action is a popup (JSON) for individual module in full-zoom canvas, # as well as "module info" page for single module (HTML) resources :my_modules, path: "/modules", only: [:show, :edit, :update, :destroy] do From 352944fc33f8d2566bbace7e4cfaa5478f5173cb Mon Sep 17 00:00:00 2001 From: zmagod Date: Thu, 28 Jul 2016 14:44:44 +0200 Subject: [PATCH 06/11] added new/edit experiment modals --- app/assets/javascripts/experiments/index.js | 29 +++++++++++++++++++ app/controllers/experiments_controller.rb | 32 +++++++++++++-------- app/views/experiments/_edit_modal.html.erb | 20 +++++++++++++ app/views/experiments/_form.html.erb | 15 ++++++++++ app/views/experiments/_new_modal.html.erb | 20 +++++++++++++ app/views/experiments/canvas.html.erb | 1 + app/views/projects/_new.html.erb | 2 +- app/views/shared/_sidebar.html.erb | 4 ++- config/initializers/assets.rb | 1 + config/locales/en.yml | 12 ++++++++ config/routes.rb | 2 +- 11 files changed, 123 insertions(+), 15 deletions(-) create mode 100644 app/assets/javascripts/experiments/index.js create mode 100644 app/views/experiments/_edit_modal.html.erb create mode 100644 app/views/experiments/_form.html.erb create mode 100644 app/views/experiments/_new_modal.html.erb diff --git a/app/assets/javascripts/experiments/index.js b/app/assets/javascripts/experiments/index.js new file mode 100644 index 000000000..37d12465b --- /dev/null +++ b/app/assets/javascripts/experiments/index.js @@ -0,0 +1,29 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. + +(function(){ + + // Initialize new experiment form + function initializeNewExperimentModal(){ + $("#new-experiment") + .on("ajax:beforeSend", function(){ + animateSpinner(this); + }) + .on("ajax:success", function(e, data){ + $('body').append($.parseHTML(data.html)); + $('#new-experiment-modal').modal('show',{ + backdrop: true, + keyboard: false, + }); + }) + .on("ajax:error", function() { + animateSpinner(this, false); + // TODO + }) + .on("ajax:complete", function(){ + animateSpinner(this, false); + }); + } + + initializeNewExperimentModal(); +})(); diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb index 6828f2cd8..eaa56b43c 100644 --- a/app/controllers/experiments_controller.rb +++ b/app/controllers/experiments_controller.rb @@ -8,18 +8,28 @@ class ExperimentsController < ApplicationController def new @experiment = Experiment.new + respond_to do |format| + format.json { + render json:{ + html: render_to_string( { + partial: "new_modal.html.erb", + locals: { experiment: @experiment } + }) + } + } + end end def create @experiment = Experiment.new(experiment_params) @experiment.created_by = current_user - # @experiment.last_modified_by = current_user + @experiment.last_modified_by = current_user + @experiment.project = @project if @experiment.save @project.experiments << @experiment flash[:success] = t('experiments.create.success_flash', name: @experiment.name) - respond_to do |format| - format.json{} - end + # have to change to experiments path + redirect_to root_path else flash[:danger] = t('experiments.create.error_flash', name: @experiment.name) render :new @@ -35,9 +45,8 @@ class ExperimentsController < ApplicationController @experiment.last_modified_by = current_user if @experiment.save flash[:success] = t('experiments.update.success_flash', name: @experiment.name) - respond_to do |format| - format.json{} - end + # have to change to experiments path + redirect_to root_path else flash[:danger] = t('experiments.create.error_flash', name: @experiment.name) render :edit @@ -50,9 +59,8 @@ class ExperimentsController < ApplicationController @experiment.archived_on = DateTime.now if @experiment.save flash[:success] = t('experiments.archive.success_flash', name: @experiment.name) - respond_to do |format| - format.json{} - end + # have to change to experiments path + redirect_to root_path else flash[:danger] = t('experiments.archive.error_flash', name: @experiment.name) end @@ -65,11 +73,11 @@ class ExperimentsController < ApplicationController end def set_project - @project = @experiment.project + @project = Project.find_by_id(params[:project_id]) end def experiment_params - params.require(:experiment).permit(:name, :description, :archived) + params.require(:experiment).permit(:name, :description) end def choose_layout diff --git a/app/views/experiments/_edit_modal.html.erb b/app/views/experiments/_edit_modal.html.erb new file mode 100644 index 000000000..6da40a7a0 --- /dev/null +++ b/app/views/experiments/_edit_modal.html.erb @@ -0,0 +1,20 @@ + + diff --git a/app/views/experiments/_form.html.erb b/app/views/experiments/_form.html.erb new file mode 100644 index 000000000..29732c85f --- /dev/null +++ b/app/views/experiments/_form.html.erb @@ -0,0 +1,15 @@ +
      +
      +
      + <%= form.text_field :name, label: t("experiments.new.name"), autofocus: true, placeholder: t("experiments.new.name_placeholder") %> +
      +
      +
      + +
      +
      +
      + <%= form.text_area :description, label: t('experiments.new.description') %> +
      +
      +
      diff --git a/app/views/experiments/_new_modal.html.erb b/app/views/experiments/_new_modal.html.erb new file mode 100644 index 000000000..598f202a4 --- /dev/null +++ b/app/views/experiments/_new_modal.html.erb @@ -0,0 +1,20 @@ + + diff --git a/app/views/experiments/canvas.html.erb b/app/views/experiments/canvas.html.erb index c8885e52e..b535e472f 100644 --- a/app/views/experiments/canvas.html.erb +++ b/app/views/experiments/canvas.html.erb @@ -37,3 +37,4 @@ <%= javascript_include_tag("eventPause-min") %> <%= javascript_include_tag("projects/canvas") %> +<%= javascript_include_tag("experiments/index") %> diff --git a/app/views/projects/_new.html.erb b/app/views/projects/_new.html.erb index 664886836..3ed45746c 100644 --- a/app/views/projects/_new.html.erb +++ b/app/views/projects/_new.html.erb @@ -13,4 +13,4 @@
    -<%= form.enum_btn_group :visibility, label: t("projects.index.modal_new_project.visibility"), btn_names: { hidden: t("projects.index.modal_new_project.visibility_hidden"), visible: t("projects.index.modal_new_project.visibility_visible") } %> \ No newline at end of file +<%= form.enum_btn_group :visibility, label: t("projects.index.modal_new_project.visibility"), btn_names: { hidden: t("projects.index.modal_new_project.visibility_hidden"), visible: t("projects.index.modal_new_project.visibility_visible") } %> diff --git a/app/views/shared/_sidebar.html.erb b/app/views/shared/_sidebar.html.erb index d0bde1ade..c461414b7 100644 --- a/app/views/shared/_sidebar.html.erb +++ b/app/views/shared/_sidebar.html.erb @@ -33,7 +33,9 @@
  • - New experiment... + <%= link_to new_project_experiment_path(@project), id: 'new-experiment', remote: true do %> + <%= t('experiments.new.create') %> + <% end %>
    • diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 32317c777..118594d19 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -35,6 +35,7 @@ Rails.application.config.assets.precompile += %w( samples/sample_datatable.js ) Rails.application.config.assets.precompile += %w( projects/index.js ) Rails.application.config.assets.precompile += %w( samples/samples_importer.js ) Rails.application.config.assets.precompile += %w( projects/canvas.js ) +Rails.application.config.assets.precompile += %w( experiments/index.js ) Rails.application.config.assets.precompile += %w( reports/index.js ) Rails.application.config.assets.precompile += %w( reports/new.js ) Rails.application.config.assets.precompile += %w( protocols/index.js ) diff --git a/config/locales/en.yml b/config/locales/en.yml index 01181d3b6..9758d61ba 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -659,6 +659,18 @@ en: no_activities: "There are no activities for this task." more_activities: "Load older activities" + experiments: + new: + create: 'New experiment...' + modal_title: 'Create new experiment' + modal_create: 'Create experiment' + name: 'Experiment name' + name_placeholder: 'My experiment' + description: 'Description' + edit: + modal_title: 'Edit experiment %{experiment}' + modal_create: 'Update experiment' + my_module_tags: new: head_title: "%{project} | %{module} | Add tag" diff --git a/config/routes.rb b/config/routes.rb index 2bf2bdf56..e755969e6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -88,7 +88,7 @@ Rails.application.routes.draw do post 'destroy', as: :destroy # Destroy multiple entries at once end end - resources :experiments, only: [:new, :create, :edit, :update, :archive] + resources :experiments, only: [:new, :create, :edit, :update, :archive], defaults: { format: 'json' } member do get 'notifications' # Notifications popup for individual project in projects index get 'samples' # Samples for single project From 23a46d5fb3dfd7aaa733c254fb76bb498d28fa1f Mon Sep 17 00:00:00 2001 From: zmagod Date: Thu, 28 Jul 2016 14:52:11 +0200 Subject: [PATCH 07/11] added translations to experiment create and edit flash messages --- app/controllers/experiments_controller.rb | 9 ++++----- config/locales/en.yml | 10 +++++++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb index eaa56b43c..d9a824e62 100644 --- a/app/controllers/experiments_controller.rb +++ b/app/controllers/experiments_controller.rb @@ -12,8 +12,7 @@ class ExperimentsController < ApplicationController format.json { render json:{ html: render_to_string( { - partial: "new_modal.html.erb", - locals: { experiment: @experiment } + partial: "new_modal.html.erb" }) } } @@ -31,7 +30,7 @@ class ExperimentsController < ApplicationController # have to change to experiments path redirect_to root_path else - flash[:danger] = t('experiments.create.error_flash', name: @experiment.name) + flash[:danger] = t('experiments.create.error_flash') render :new end end @@ -48,7 +47,7 @@ class ExperimentsController < ApplicationController # have to change to experiments path redirect_to root_path else - flash[:danger] = t('experiments.create.error_flash', name: @experiment.name) + flash[:danger] = t('experiments.update.error_flash') render :edit end end @@ -62,7 +61,7 @@ class ExperimentsController < ApplicationController # have to change to experiments path redirect_to root_path else - flash[:danger] = t('experiments.archive.error_flash', name: @experiment.name) + flash[:danger] = t('experiments.archive.error_flash') end end diff --git a/config/locales/en.yml b/config/locales/en.yml index 9758d61ba..b0ab655cf 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -670,7 +670,15 @@ en: edit: modal_title: 'Edit experiment %{experiment}' modal_create: 'Update experiment' - + create: + success_flash: "Successfully created experiment %{experiment}" + error_flash: 'Could not create a new experiment.' + update: + success_flash: "Successfully updated experiment %{experiment}" + error_flash: 'Could not update the experiment.' + archive: + success_flash: "Successfully archived experiment %{experiment}" + error_flash: 'Could not archive the experiment.' my_module_tags: new: head_title: "%{project} | %{module} | Add tag" From d91aa5c60bc98f620fd451e26bc355fe4e6f7253 Mon Sep 17 00:00:00 2001 From: zmagod Date: Thu, 28 Jul 2016 14:57:47 +0200 Subject: [PATCH 08/11] fixed translation sting 'name' to 'experiment' --- app/controllers/experiments_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb index d9a824e62..e34cbc9b2 100644 --- a/app/controllers/experiments_controller.rb +++ b/app/controllers/experiments_controller.rb @@ -26,7 +26,7 @@ class ExperimentsController < ApplicationController @experiment.project = @project if @experiment.save @project.experiments << @experiment - flash[:success] = t('experiments.create.success_flash', name: @experiment.name) + flash[:success] = t('experiments.create.success_flash', experiment: @experiment.name) # have to change to experiments path redirect_to root_path else @@ -43,7 +43,7 @@ class ExperimentsController < ApplicationController @experiment.update_attributes(experiment_params) @experiment.last_modified_by = current_user if @experiment.save - flash[:success] = t('experiments.update.success_flash', name: @experiment.name) + flash[:success] = t('experiments.update.success_flash', experiment: @experiment.name) # have to change to experiments path redirect_to root_path else @@ -57,7 +57,7 @@ class ExperimentsController < ApplicationController @experiment.archived_by = current_user @experiment.archived_on = DateTime.now if @experiment.save - flash[:success] = t('experiments.archive.success_flash', name: @experiment.name) + flash[:success] = t('experiments.archive.success_flash', experiment: @experiment.name) # have to change to experiments path redirect_to root_path else From e95f5189649a5eea99883af74d1ea2c29c914435 Mon Sep 17 00:00:00 2001 From: zmagod Date: Thu, 28 Jul 2016 16:01:53 +0200 Subject: [PATCH 09/11] refactor canvas_controller, experiments_controller --- app/assets/javascripts/experiments/index.js | 6 +++--- app/controllers/canvas_controller.rb | 8 ++++---- app/controllers/experiments_controller.rb | 12 ++++++------ app/views/experiments/canvas.html.erb | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/experiments/index.js b/app/assets/javascripts/experiments/index.js index 37d12465b..ec2d051c4 100644 --- a/app/assets/javascripts/experiments/index.js +++ b/app/assets/javascripts/experiments/index.js @@ -7,7 +7,7 @@ function initializeNewExperimentModal(){ $("#new-experiment") .on("ajax:beforeSend", function(){ - animateSpinner(this); + animateSpinner(); }) .on("ajax:success", function(e, data){ $('body').append($.parseHTML(data.html)); @@ -17,11 +17,11 @@ }); }) .on("ajax:error", function() { - animateSpinner(this, false); + animateSpinner(null, false); // TODO }) .on("ajax:complete", function(){ - animateSpinner(this, false); + animateSpinner(null, false); }); } diff --git a/app/controllers/canvas_controller.rb b/app/controllers/canvas_controller.rb index 92c655c8e..0cddfc386 100644 --- a/app/controllers/canvas_controller.rb +++ b/app/controllers/canvas_controller.rb @@ -6,25 +6,25 @@ class CanvasController < ApplicationController def edit render partial: 'canvas/edit', - locals: { project: @project, experiment: @experiment, my_modules: @my_modules }, + locals: { experiment: @experiment, my_modules: @my_modules }, :content_type => 'text/html' end def full_zoom render partial: 'canvas/full_zoom', - locals: { project: @project, experiment: @experiment, my_modules: @my_modules }, + locals: { experiment: @experiment, my_modules: @my_modules }, :content_type => 'text/html' end def medium_zoom render partial: 'canvas/medium_zoom', - locals: { project: @project, experiment: @experiment, my_modules: @my_modules }, + locals: { experiment: @experiment, my_modules: @my_modules }, :content_type => 'text/html' end def small_zoom render partial: 'canvas/small_zoom', - locals: { project: @project, experiment: @experiment, my_modules: @my_modules }, + locals: { experiment: @experiment, my_modules: @my_modules }, :content_type => 'text/html' end diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb index e34cbc9b2..63065e666 100644 --- a/app/controllers/experiments_controller.rb +++ b/app/controllers/experiments_controller.rb @@ -25,13 +25,12 @@ class ExperimentsController < ApplicationController @experiment.last_modified_by = current_user @experiment.project = @project if @experiment.save - @project.experiments << @experiment flash[:success] = t('experiments.create.success_flash', experiment: @experiment.name) # have to change to experiments path redirect_to root_path else - flash[:danger] = t('experiments.create.error_flash') - render :new + flash[:alert] = t('experiments.create.error_flash') + redirect_to :back end end @@ -47,8 +46,8 @@ class ExperimentsController < ApplicationController # have to change to experiments path redirect_to root_path else - flash[:danger] = t('experiments.update.error_flash') - render :edit + flash[:alert] = t('experiments.update.error_flash') + redirect_to :back end end @@ -61,7 +60,8 @@ class ExperimentsController < ApplicationController # have to change to experiments path redirect_to root_path else - flash[:danger] = t('experiments.archive.error_flash') + flash[:alert] = t('experiments.archive.error_flash') + redirect_to :back end end diff --git a/app/views/experiments/canvas.html.erb b/app/views/experiments/canvas.html.erb index b535e472f..edbad799e 100644 --- a/app/views/experiments/canvas.html.erb +++ b/app/views/experiments/canvas.html.erb @@ -25,7 +25,7 @@ data-sidebar-click-module-step-text="<%=t 'tutorial.sidebar_click_module_html' %>" data-edit-workflow-step-text="<%=t 'tutorial.edit_workflow_html' %>" data-edit-workflow-click-save-step-text="<%=t 'tutorial.edit_workflow_click_save_html' %>"> - <%= render partial: 'canvas/full_zoom', locals: { project: @project, experiment: @experiment, my_modules: @experiment.active_modules } %> + <%= render partial: 'canvas/full_zoom', locals: { experiment: @experiment, my_modules: @experiment.active_modules } %> From c8ef3b1899169dcaea56a88a1241fa89998fcd69 Mon Sep 17 00:00:00 2001 From: Luka Murn Date: Thu, 28 Jul 2016 16:40:51 +0200 Subject: [PATCH 10/11] Fix first time generator --- app/utilities/delayed_uploader_tutorial.rb | 6 +++--- app/utilities/first_time_data_generator.rb | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/utilities/delayed_uploader_tutorial.rb b/app/utilities/delayed_uploader_tutorial.rb index 6b9a52fd9..ac71eb77d 100644 --- a/app/utilities/delayed_uploader_tutorial.rb +++ b/app/utilities/delayed_uploader_tutorial.rb @@ -25,12 +25,12 @@ class DelayedUploaderTutorial temp_result.save temp_asset.save - temp_asset.post_process_file(my_module.project.organization) + temp_asset.post_process_file(my_module.experiment.project.organization) # Create result activity Activity.create( type_of: :add_result, - project: my_module.project, + project: my_module.experiment.project, my_module: my_module, user: current_user, created_at: temp_result.created_at, @@ -46,6 +46,6 @@ class DelayedUploaderTutorial def self.add_step_asset(step:, current_user:, file_name:) temp_asset = DelayedUploaderTutorial.get_asset(current_user, file_name) step.assets << temp_asset - temp_asset.post_process_file(step.my_module.project.organization) + temp_asset.post_process_file(step.my_module.experiment.project.organization) end end diff --git a/app/utilities/first_time_data_generator.rb b/app/utilities/first_time_data_generator.rb index 7ecda05fb..0be11f27a 100644 --- a/app/utilities/first_time_data_generator.rb +++ b/app/utilities/first_time_data_generator.rb @@ -862,7 +862,7 @@ module FirstTimeDataGenerator # Create activity Activity.create( type_of: :create_step, - project: my_module.project, + project: my_module.experiment.project, my_module: my_module, user: step.user, created_at: created_at, @@ -876,7 +876,7 @@ module FirstTimeDataGenerator if completed then Activity.create( type_of: :complete_step, - project: my_module.project, + project: my_module.experiment.project, my_module: my_module, user: step.user, created_at: completed_on, @@ -907,7 +907,7 @@ module FirstTimeDataGenerator ) Activity.create( type_of: :add_comment_to_step, - project: my_module.project, + project: my_module.experiment.project, my_module: my_module, user: @user, created_at: commented_on, From b64e200b91bdde0f545223d67d4daec9fed064d2 Mon Sep 17 00:00:00 2001 From: Luka Murn Date: Thu, 28 Jul 2016 16:41:10 +0200 Subject: [PATCH 11/11] Refactor canvas a lot. Also refactor localization files concerning canvas. --- app/controllers/canvas_controller.rb | 5 +- app/controllers/my_module_tags_controller.rb | 2 +- app/controllers/my_modules_controller.rb | 12 +- app/controllers/projects_controller.rb | 8 - app/helpers/permission_helper.rb | 8 +- app/helpers/sidebar_helper.rb | 2 +- app/views/canvas/_edit.html.erb | 30 +-- app/views/canvas/edit/_my_module.html.erb | 14 +- .../canvas/edit/modal/_delete_module.html.erb | 6 +- .../edit/modal/_delete_module_group.html.erb | 6 +- .../canvas/edit/modal/_edit_module.html.erb | 12 +- .../edit/modal/_edit_module_group.html.erb | 12 +- .../canvas/edit/modal/_new_module.html.erb | 12 +- .../canvas/full_zoom/_my_module.html.erb | 2 +- app/views/experiments/canvas.html.erb | 6 +- app/views/my_module_comments/_index.html.erb | 8 +- app/views/my_module_tags/_index_edit.html.erb | 34 ++-- app/views/my_modules/_activities.html.erb | 6 +- .../my_modules/_description_label.html.erb | 2 +- app/views/my_modules/_due_date_label.html.erb | 2 +- .../_module_header_due_date_label.html.erb | 2 +- app/views/my_modules/_show.html.erb | 4 +- .../modals/_manage_module_tags_modal.html.erb | 2 +- .../modals/_manage_users_modal.html.erb | 10 +- app/views/projects/canvas.html.erb | 39 ---- app/views/projects/index/_project.html.erb | 2 +- app/views/projects/show.html.erb | 2 + app/views/sample_my_modules/_index.html.erb | 6 +- app/views/user_my_modules/_index.html.erb | 10 +- .../user_my_modules/_index_edit.html.erb | 8 +- config/locales/en.yml | 177 +++++++++--------- config/routes.rb | 4 +- 32 files changed, 205 insertions(+), 250 deletions(-) delete mode 100644 app/views/projects/canvas.html.erb diff --git a/app/controllers/canvas_controller.rb b/app/controllers/canvas_controller.rb index 0cddfc386..c07e59ad3 100644 --- a/app/controllers/canvas_controller.rb +++ b/app/controllers/canvas_controller.rb @@ -232,7 +232,7 @@ class CanvasController < ApplicationController end flash[:success] = t( - "projects.canvas.update.success_flash") + "experiments.canvas.update.success_flash") redirect_to canvas_experiment_path(@experiment) end @@ -254,7 +254,6 @@ class CanvasController < ApplicationController def load_vars @experiment = Experiment.find_by_id(params[:id]) - @project = @experiment.project unless @experiment respond_to do |format| format.html { render_404 and return } @@ -266,7 +265,7 @@ class CanvasController < ApplicationController end def check_edit_canvas - unless can_edit_canvas(@project) + unless can_edit_canvas(@experiment) render_403 and return end end diff --git a/app/controllers/my_module_tags_controller.rb b/app/controllers/my_module_tags_controller.rb index b683034f8..aa1dbf916 100644 --- a/app/controllers/my_module_tags_controller.rb +++ b/app/controllers/my_module_tags_controller.rb @@ -8,7 +8,7 @@ class MyModuleTagsController < ApplicationController @my_module_tags = @my_module.my_module_tags @unassigned_tags = @my_module.unassigned_tags @new_mmt = MyModuleTag.new(my_module: @my_module) - @new_tag = Tag.new(project: @my_module.project) + @new_tag = Tag.new(project: @my_module.experiment.project) respond_to do |format| format.json { diff --git a/app/controllers/my_modules_controller.rb b/app/controllers/my_modules_controller.rb index 58da7d3a9..08f9e2f63 100644 --- a/app/controllers/my_modules_controller.rb +++ b/app/controllers/my_modules_controller.rb @@ -147,7 +147,7 @@ class MyModulesController < ApplicationController # Currently not in use Activity.create( type_of: :archive_module, - project: @my_module.project, + project: @my_module.experiment.project, my_module: @my_module, user: current_user, message: t( @@ -162,7 +162,7 @@ class MyModulesController < ApplicationController if saved Activity.create( type_of: :restore_module, - project: @my_module.project, + project: @my_module.experiment.project, my_module: @my_module, user: current_user, message: t( @@ -178,7 +178,7 @@ class MyModulesController < ApplicationController if saved and description_changed then Activity.create( type_of: :change_module_description, - project: @my_module.project, + project: @my_module.experiment.project, my_module: @my_module, user: current_user, message: t( @@ -240,7 +240,7 @@ class MyModulesController < ApplicationController def samples @samples_index_link = samples_index_my_module_path(@my_module, format: :json) - @organization = @my_module.project.organization + @organization = @my_module.experiment.project.organization end def archive @@ -293,7 +293,7 @@ class MyModulesController < ApplicationController # AJAX actions def samples_index - @organization = @my_module.project.organization + @organization = @my_module.experiment.project.organization respond_to do |format| format.html @@ -309,7 +309,7 @@ class MyModulesController < ApplicationController @direct_upload = ENV['PAPERCLIP_DIRECT_UPLOAD'] == "true" @my_module = MyModule.find_by_id(params[:id]) if @my_module - @project = @my_module.project + @project = @my_module.experiment.project else render_404 end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 62a7deb30..5f3fd4296 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -12,7 +12,6 @@ class ProjectsController < ApplicationController before_action :check_view_notifications_permissions, only: [ :notifications ] before_action :check_edit_permissions, only: [ :edit ] before_action :check_module_archive_permissions, only: [:module_archive] - before_action :check_canvas_permissions, only: [:workflow] filter_by_archived = false @@ -311,13 +310,6 @@ class ProjectsController < ApplicationController end end - def check_canvas_permissions - @project = Project.find_by_id(wf_params[:id]) - unless can_edit_canvas(@project) - render_403 - end - end - def check_module_archive_permissions unless can_restore_archived_modules(@project) render_403 diff --git a/app/helpers/permission_helper.rb b/app/helpers/permission_helper.rb index c134b182c..cd181e8c8 100644 --- a/app/helpers/permission_helper.rb +++ b/app/helpers/permission_helper.rb @@ -323,8 +323,8 @@ module PermissionHelper # ---- WORKFLOW PERMISSIONS ---- - def can_edit_canvas(project) - is_user_or_higher_of_project(project) + def can_edit_canvas(experiment) + is_user_or_higher_of_project(experiment.project) end def can_reposition_modules(experiment) @@ -378,11 +378,11 @@ module PermissionHelper end def can_add_tag_to_module(my_module) - is_user_or_higher_of_project(my_module.project) + is_user_or_higher_of_project(my_module.experiment.project) end def can_remove_tag_from_module(my_module) - is_user_or_higher_of_project(my_module.project) + is_user_or_higher_of_project(my_module.experiment.project) end def can_view_module_info(my_module) diff --git a/app/helpers/sidebar_helper.rb b/app/helpers/sidebar_helper.rb index f23d1a7dd..93afa232d 100644 --- a/app/helpers/sidebar_helper.rb +++ b/app/helpers/sidebar_helper.rb @@ -15,7 +15,7 @@ module SidebarHelper when "archive" return module_archive_project_url(project) else - return canvas_project_path(project) + return project_path(project) end end diff --git a/app/views/canvas/_edit.html.erb b/app/views/canvas/_edit.html.erb index 4cd74b2e9..8c01d4206 100644 --- a/app/views/canvas/_edit.html.erb +++ b/app/views/canvas/_edit.html.erb @@ -6,16 +6,16 @@ data-can-delete-modules="<%= can_archive_modules(@experiment) ? "yes" : "no" %>" data-can-reposition-modules="<%= can_reposition_modules(@experiment) ? "yes" : "no" %>" data-can-edit-connections="<%= can_edit_connections(@experiment) ? "yes" : "no" %>" - data-unsaved-work-text="<%=t "projects.canvas.edit.unsaved_work" %>" + data-unsaved-work-text="<%=t "experiments.canvas.edit.unsaved_work" %>" > <%= bootstrap_form_tag url: canvas_experiment_url, method: "post" do |f| %>
    <%= f.submit class: "btn btn-primary", id: "canvas-save" do %> - <%= t("projects.canvas.edit.save_short") %> - + <%= t("experiments.canvas.edit.save_short") %> + <% end %> <%= link_to canvas_experiment_path(@experiment), type: "button", class: "btn btn-default cancel-edit-canvas" do %> - +   <% end %>
    @@ -23,12 +23,12 @@ <%=link_to "", type: "button", class: "btn btn-default", id: "canvas-new-module" do %> - <%= t("projects.canvas.edit.new_module") %> + <%= t("experiments.canvas.edit.new_module") %> - - <%= t("projects.canvas.edit.new_module") %> + + <%= t("experiments.canvas.edit.new_module") %> <% end %> <% end %> @@ -42,28 +42,28 @@ <%= hidden_field_tag 'module-groups', '{}' %> <% end %>
    diff --git a/app/views/canvas/edit/_my_module.html.erb b/app/views/canvas/edit/_my_module.html.erb index bfaae0f62..c9670ce93 100644 --- a/app/views/canvas/edit/_my_module.html.erb +++ b/app/views/canvas/edit/_my_module.html.erb @@ -23,30 +23,30 @@
  • <%= t('projects.index.options_header') %>
    • <% if can_edit_module(my_module) %>
  • - <%=t "projects.canvas.edit.edit_module" %> + <%=t "experiments.canvas.edit.edit_module" %>
    • <% end %> <% if can_edit_module_groups(my_module.experiment) %>
  • > - <%=t "projects.canvas.edit.edit_module_group" %> + <%=t "experiments.canvas.edit.edit_module_group" %>
    • <% end %> <% if can_clone_modules(my_module.experiment) %>
  • - <%=t "projects.canvas.edit.clone_module" %> + <%=t "experiments.canvas.edit.clone_module" %>
  • > - <%=t "projects.canvas.edit.clone_module_group" %> + <%=t "experiments.canvas.edit.clone_module_group" %>
    • <% end %> <% if can_archive_module(my_module) %>
  • - <%=t "projects.canvas.edit.delete_module" %> + <%=t "experiments.canvas.edit.delete_module" %>
    • <% end %> <% if can_archive_modules(my_module.experiment) %>
  • > - <%=t "projects.canvas.edit.delete_module_group" %> + <%=t "experiments.canvas.edit.delete_module_group" %>
    • <% end %> @@ -56,7 +56,7 @@ <% if can_edit_connections(my_module.experiment) %>
    - <%=t "projects.canvas.edit.drag_connections" %> + <%=t "experiments.canvas.edit.drag_connections" %>
    <% end %> diff --git a/app/views/canvas/edit/modal/_delete_module.html.erb b/app/views/canvas/edit/modal/_delete_module.html.erb index dc9e57043..90a4b58da 100644 --- a/app/views/canvas/edit/modal/_delete_module.html.erb +++ b/app/views/canvas/edit/modal/_delete_module.html.erb @@ -3,15 +3,15 @@
    - +
    - +
    - +
    diff --git a/app/views/canvas/edit/modal/_delete_module_group.html.erb b/app/views/canvas/edit/modal/_delete_module_group.html.erb index 8e8b03b7a..9d6e82f2a 100644 --- a/app/views/canvas/edit/modal/_delete_module_group.html.erb +++ b/app/views/canvas/edit/modal/_delete_module_group.html.erb @@ -3,15 +3,15 @@
    - +
    - +
    - +
    diff --git a/app/views/canvas/edit/modal/_edit_module.html.erb b/app/views/canvas/edit/modal/_edit_module.html.erb index f1ae36479..6f4c6b091 100644 --- a/app/views/canvas/edit/modal/_edit_module.html.erb +++ b/app/views/canvas/edit/modal/_edit_module.html.erb @@ -3,25 +3,25 @@
    - +
    <%= bootstrap_form_tag do |f| %> - <%= f.text_field t("projects.canvas.edit.modal_edit_module.name"), id: "edit-module-name-input" %> + <%= f.text_field t("experiments.canvas.edit.modal_edit_module.name"), id: "edit-module-name-input" %> <% end %>
    - +
    diff --git a/app/views/canvas/edit/modal/_edit_module_group.html.erb b/app/views/canvas/edit/modal/_edit_module_group.html.erb index cbdf51fd6..f8f576453 100644 --- a/app/views/canvas/edit/modal/_edit_module_group.html.erb +++ b/app/views/canvas/edit/modal/_edit_module_group.html.erb @@ -3,25 +3,25 @@
    - +
    <%= bootstrap_form_tag do |f| %> - <%= f.text_field t("projects.canvas.edit.modal_edit_module_group.name"), id: "edit-module-group-name-input" %> + <%= f.text_field t("experiments.canvas.edit.modal_edit_module_group.name"), id: "edit-module-group-name-input" %> <% end %>
    - +
    diff --git a/app/views/canvas/edit/modal/_new_module.html.erb b/app/views/canvas/edit/modal/_new_module.html.erb index 9c70387b4..42059ad01 100644 --- a/app/views/canvas/edit/modal/_new_module.html.erb +++ b/app/views/canvas/edit/modal/_new_module.html.erb @@ -3,25 +3,25 @@
    - +
    <%= bootstrap_form_tag do |f| %> - <%= f.text_field t("projects.canvas.edit.modal_new_module.name"), placeholder: t("projects.canvas.edit.modal_new_module.name_placeholder"), id: "new-module-name-input" %> + <%= f.text_field t("experiments.canvas.edit.modal_new_module.name"), placeholder: t("experiments.canvas.edit.modal_new_module.name_placeholder"), id: "new-module-name-input" %> <% end %>
    - +
    diff --git a/app/views/canvas/full_zoom/_my_module.html.erb b/app/views/canvas/full_zoom/_my_module.html.erb index e9c985506..11c46ec2c 100644 --- a/app/views/canvas/full_zoom/_my_module.html.erb +++ b/app/views/canvas/full_zoom/_my_module.html.erb @@ -32,7 +32,7 @@
    - <%= link_to_if can_edit_module(my_module), t("projects.canvas.full_zoom.due_date"), due_date_my_module_path(my_module, format: :json), remote: true, class: "due-date-link" %> + <%= link_to_if can_edit_module(my_module), t("experiments.canvas.full_zoom.due_date"), due_date_my_module_path(my_module, format: :json), remote: true, class: "due-date-link" %>
    <% if can_edit_module(my_module) %> diff --git a/app/views/experiments/canvas.html.erb b/app/views/experiments/canvas.html.erb index edbad799e..7ba7e19b2 100644 --- a/app/views/experiments/canvas.html.erb +++ b/app/views/experiments/canvas.html.erb @@ -1,10 +1,10 @@ -<% provide(:head_title, raw(t("projects.canvas.head_title", project: @project.name))) %> +<% provide(:head_title, raw(t("experiments.canvas.head_title", project: @project.name))) %> <%= render partial: "shared/sidebar" %> <%= render partial: "shared/secondary_navigation" %>
    - <% if can_edit_canvas(@project) %> - <%=link_to t("projects.canvas.canvas_edit"), canvas_edit_experiment_url(@experiment), remote: true, type: "button", id: "edit-canvas-button", class: "ajax btn btn-default", "data-action" => "edit" %> + <% if can_edit_canvas(@experiment) %> + <%=link_to t("experiments.canvas.canvas_edit"), canvas_edit_experiment_url(@experiment), remote: true, type: "button", id: "edit-canvas-button", class: "ajax btn btn-default", "data-action" => "edit" %> <% end %>
    <%=link_to canvas_full_zoom_experiment_path(@experiment), remote: true, type: "button", class: "ajax btn btn-primary active", "data-action" => "full_zoom", "data-toggle" => "button", "aria-pressed" => true do %> diff --git a/app/views/my_module_comments/_index.html.erb b/app/views/my_module_comments/_index.html.erb index 516dd1ba5..aff54c799 100644 --- a/app/views/my_module_comments/_index.html.erb +++ b/app/views/my_module_comments/_index.html.erb @@ -1,15 +1,15 @@ -
    <%= t('projects.canvas.popups.comments_tab') %>
    +
    <%= t('experiments.canvas.popups.comments_tab') %>
      <% if @comments.size == 0 then %> -
    • <%= t 'projects.canvas.popups.no_comments' %>
      • +
    • <%= t 'experiments.canvas.popups.no_comments' %>
      • <% else %> <%= render 'my_module_comments/list.html.erb', comments: @comments %> <% end %> <% if @comments.length == @per_page %>
    • - <%=t "projects.canvas.popups.more_comments" %> + <%=t "experiments.canvas.popups.more_comments" %>
      • <% end %> @@ -19,7 +19,7 @@
    • <%= bootstrap_form_for :comment, url: { format: :json }, method: :post, remote: true do |f| %> - <%= f.text_field :message, hide_label: true, placeholder: t("projects.canvas.popups.comment_placeholder"), append: f.submit("+"), help: '.' %> + <%= f.text_field :message, hide_label: true, placeholder: t("experiments.canvas.popups.comment_placeholder"), append: f.submit("+"), help: '.' %> <% end %>
    diff --git a/app/views/my_module_tags/_index_edit.html.erb b/app/views/my_module_tags/_index_edit.html.erb index 7167c7acd..0b485a09d 100644 --- a/app/views/my_module_tags/_index_edit.html.erb +++ b/app/views/my_module_tags/_index_edit.html.erb @@ -1,6 +1,6 @@ -
    <%=t "projects.canvas.modal_manage_tags.subtitle", module: @my_module.name %>
    +
    <%=t "experiments.canvas.modal_manage_tags.subtitle", module: @my_module.name %>
    <% if @my_module_tags.size == 0 then %> -
    <%= t 'projects.canvas.modal_manage_tags.no_tags' %>
    +
    <%= t 'experiments.canvas.modal_manage_tags.no_tags' %>
    <% else %>
      <% @my_module_tags.each_with_index do |mmt, i| tag = mmt.tag %> @@ -11,20 +11,20 @@

      <%= tag.name %>

    - <% if can_edit_tag(@my_module.project) then %> - <%= link_to "", remote: true, class: 'btn btn-link edit-tag-link', title: t("projects.canvas.modal_manage_tags.edit_tag") do %> + <% if can_edit_tag(@my_module.experiment.project) then %> + <%= link_to "", remote: true, class: 'btn btn-link edit-tag-link', title: t("experiments.canvas.modal_manage_tags.edit_tag") do %> <% end %> <% end %> <% if can_remove_tag_from_module(@my_module) then %> - <%= link_to my_module_my_module_tag_path(@my_module, mmt, format: :json), method: :delete, remote: true, class: 'btn btn-link remove-tag-link', title: t("projects.canvas.modal_manage_tags.remove_tag", module: @my_module.name) do %> + <%= link_to my_module_my_module_tag_path(@my_module, mmt, format: :json), method: :delete, remote: true, class: 'btn btn-link remove-tag-link', title: t("experiments.canvas.modal_manage_tags.remove_tag", module: @my_module.name) do %> <% end %> <% end %> - <% if can_delete_tag(@my_module.project) then %> - <%= bootstrap_form_for tag, remote: true, url: project_tag_path(@my_module.project, tag, format: :json), method: :delete, html: { class: "delete-tag-form"} do |f| %> + <% if can_delete_tag(@my_module.experiment.project) then %> + <%= bootstrap_form_for tag, remote: true, url: project_tag_path(@my_module.experiment.project, tag, format: :json), method: :delete, html: { class: "delete-tag-form"} do |f| %> <%= hidden_field_tag :my_module_id, @my_module.id %> - <%= f.button class: 'btn btn-link delete-tag-link', title: t("projects.canvas.modal_manage_tags.delete_tag") do %> + <%= f.button class: 'btn btn-link delete-tag-link', title: t("experiments.canvas.modal_manage_tags.delete_tag") do %> <% end %> <% end %> @@ -32,19 +32,19 @@
    - <% if can_edit_tag(@my_module.project) %> + <% if can_edit_tag(@my_module.experiment.project) %>
    <% end %> <% end %> - <% if can_create_new_tag(@my_module.project) then %> + <% if can_create_new_tag(@my_module.experiment.project) then %>
    - <%= bootstrap_form_for [@my_module.project, @new_tag], remote: true, format: :json, html: { class: 'add-tag-form' } do |f| %> + <%= 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.project.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 => TAG_COLORS[0] %> <%= f.button class: "btn btn-primary" do %> - + <% end %> <% end %>
    diff --git a/app/views/my_modules/_activities.html.erb b/app/views/my_modules/_activities.html.erb index 6229f2eb0..d012c9cc6 100644 --- a/app/views/my_modules/_activities.html.erb +++ b/app/views/my_modules/_activities.html.erb @@ -1,8 +1,8 @@ -
    <%= t("projects.canvas.popups.activities_tab") %>
    +
    <%= t("experiments.canvas.popups.activities_tab") %>
      <% if @activities.size == 0 then %> -
    • <%= t 'projects.canvas.popups.no_activities' %>
      • +
    • <%= t 'experiments.canvas.popups.no_activities' %>
      • <% else %> <% @activities.each do |activity| %>
    • <%=l activity.created_at, format: :full %> @@ -11,5 +11,5 @@ <% end %> <% end %>
      -
    • <%= link_to t("projects.canvas.popups.more_activities"), activities_my_module_path(@my_module) %>
      • +
    • <%= link_to t("experiments.canvas.popups.more_activities"), activities_my_module_path(@my_module) %>
    diff --git a/app/views/my_modules/_description_label.html.erb b/app/views/my_modules/_description_label.html.erb index 46f1027da..c1974bbb0 100644 --- a/app/views/my_modules/_description_label.html.erb +++ b/app/views/my_modules/_description_label.html.erb @@ -1,5 +1,5 @@ <% if @my_module.description.blank? %> - <%=t "projects.canvas.popups.no_description" %> + <%=t "experiments.canvas.popups.no_description" %> <% else %> <%= @my_module.description %> <% end %> \ No newline at end of file diff --git a/app/views/my_modules/_due_date_label.html.erb b/app/views/my_modules/_due_date_label.html.erb index 53740adad..20ed19628 100644 --- a/app/views/my_modules/_due_date_label.html.erb +++ b/app/views/my_modules/_due_date_label.html.erb @@ -4,5 +4,5 @@ <% end %> <% else %> - <%=t "projects.canvas.full_zoom.no_due_date" %> + <%=t "experiments.canvas.full_zoom.no_due_date" %> <% end %> diff --git a/app/views/my_modules/_module_header_due_date_label.html.erb b/app/views/my_modules/_module_header_due_date_label.html.erb index c193aae34..975331bbc 100644 --- a/app/views/my_modules/_module_header_due_date_label.html.erb +++ b/app/views/my_modules/_module_header_due_date_label.html.erb @@ -1,5 +1,5 @@ <% if @my_module.due_date.blank? %> - <%=t "projects.canvas.full_zoom.no_due_date" %> + <%=t "experiments.canvas.full_zoom.no_due_date" %> <% else %> <%= l(@my_module.due_date, format: :full) %> <% end %> \ No newline at end of file diff --git a/app/views/my_modules/_show.html.erb b/app/views/my_modules/_show.html.erb index 7212250fd..b497e1756 100644 --- a/app/views/my_modules/_show.html.erb +++ b/app/views/my_modules/_show.html.erb @@ -1,4 +1,4 @@ -
    <%=t "projects.canvas.popups.info_tab" %>
    +
    <%=t "experiments.canvas.popups.info_tab" %>
    • @@ -9,7 +9,7 @@ <% if can_edit_module(@my_module) %>
    • - <%= link_to t("projects.canvas.popups.full_info"), description_my_module_path(@my_module, format: :json), class: "description-link", remote: true %> + <%= link_to t("experiments.canvas.popups.full_info"), description_my_module_path(@my_module, format: :json), class: "description-link", remote: true %>
      • <% end %>
    \ No newline at end of file diff --git a/app/views/my_modules/modals/_manage_module_tags_modal.html.erb b/app/views/my_modules/modals/_manage_module_tags_modal.html.erb index 1c3e2edb1..23e34bfda 100644 --- a/app/views/my_modules/modals/_manage_module_tags_modal.html.erb +++ b/app/views/my_modules/modals/_manage_module_tags_modal.html.erb @@ -3,7 +3,7 @@
    - +
    diff --git a/app/views/my_modules/modals/_manage_users_modal.html.erb b/app/views/my_modules/modals/_manage_users_modal.html.erb index f56a9fd92..74508ab1c 100644 --- a/app/views/my_modules/modals/_manage_users_modal.html.erb +++ b/app/views/my_modules/modals/_manage_users_modal.html.erb @@ -3,16 +3,16 @@
    - +
    - <% if is_admin_of_organization(@project.organization) %> - <%= link_to t("projects.canvas.full_zoom.modal_manage_users.invite_users_link"), organization_path(organization_id: @project.organization.id) %> - <%=t "projects.canvas.full_zoom.modal_manage_users.invite_users_details", organization: @project.organization.name %> + <% if is_admin_of_organization(@experiment.project.organization) %> + <%= link_to t("experiments.canvas.full_zoom.modal_manage_users.invite_users_link"), organization_path(organization_id: @experiment.project.organization.id) %> + <%=t "experiments.canvas.full_zoom.modal_manage_users.invite_users_details", organization: @experiment.project.organization.name %> <% else %> - <%=t "projects.canvas.full_zoom.modal_manage_users.contact_admins", organization: @project.organization.name %> + <%=t "experiments.canvas.full_zoom.modal_manage_users.contact_admins", organization: @experiment.project.organization.name %> <% end %> diff --git a/app/views/projects/canvas.html.erb b/app/views/projects/canvas.html.erb deleted file mode 100644 index 07459fcb7..000000000 --- a/app/views/projects/canvas.html.erb +++ /dev/null @@ -1,39 +0,0 @@ -<% provide(:head_title, raw(t("projects.canvas.head_title", project: @project.name))) %> -<%= render partial: "shared/sidebar" %> -<%= render partial: "shared/secondary_navigation" %> - -
    - <% if can_edit_canvas(@project) %> - <%=link_to t("projects.canvas.canvas_edit"), canvas_edit_project_url(@project), remote: true, type: "button", id: "edit-canvas-button", class: "ajax btn btn-default", "data-action" => "edit" %> - <% end %> -
    - <%=link_to canvas_full_zoom_project_path(@project), remote: true, type: "button", class: "ajax btn btn-primary active", "data-action" => "full_zoom", "data-toggle" => "button", "aria-pressed" => true do %> - - <% end %> - <%=link_to canvas_medium_zoom_project_path(@project), remote: true, type: "button", class: "ajax btn btn-primary", "data-action" => "medium_zoom" do %> - - <% end %> - <%=link_to canvas_small_zoom_project_path(@project), remote: true, type: "button", class: "ajax btn btn-primary", "data-action" => "small_zoom" do %> - - <% end %> -
    -
    -
    - <%= render partial: 'canvas/full_zoom', locals: { project: @project, my_modules: @project.active_modules } %> -
    - - -<%= render partial: "my_modules/modals/manage_module_tags_modal", locals: { my_module: nil } %> - - -<%= javascript_include_tag("jsPlumb-2.0.4-min") %> -<%= javascript_include_tag("jsnetworkx") %> -<%= javascript_include_tag("eventPause-min") %> - -<%= javascript_include_tag("projects/canvas") %> diff --git a/app/views/projects/index/_project.html.erb b/app/views/projects/index/_project.html.erb index d46293f6a..baa6a8446 100644 --- a/app/views/projects/index/_project.html.erb +++ b/app/views/projects/index/_project.html.erb @@ -33,7 +33,7 @@ data-project-users-tab-url="<%= url_for project_user_projects_path(project_id: p <% end %> <% if can_view_project(project) then %> - <%#= link_to project.name, canvas_project_path(project), id: "#{project.id}-project-canvas-link" %> + <%= link_to project.name, project_path(project), id: "#{project.id}-project-canvas-link" %> <% else %> <%= project.name %> <% end %> diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index b696f3705..9b228dbe5 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -1,3 +1,5 @@ <% provide(:head_title, raw(t("projects.show.head_title", project: @project.name))) %> <%= render partial: "shared/sidebar" %> <%= render partial: "shared/secondary_navigation" %> + +TODO \ No newline at end of file diff --git a/app/views/sample_my_modules/_index.html.erb b/app/views/sample_my_modules/_index.html.erb index 3bf2a0704..c4d03088d 100644 --- a/app/views/sample_my_modules/_index.html.erb +++ b/app/views/sample_my_modules/_index.html.erb @@ -1,13 +1,13 @@ -
    <%= t('projects.canvas.popups.samples_tab') %>
    +
    <%= t('experiments.canvas.popups.samples_tab') %>
      <% if @number_of_samples == 0 then %> -
    • <%= t 'projects.canvas.popups.no_samples' %>
      • +
    • <%= t 'experiments.canvas.popups.no_samples' %>
      • <% else %> <% @samples.each do |sample| %>
    • <%= sample.name %>
      • <% end %> <% end %>
      -
    • <%= link_to t("projects.canvas.popups.manage_samples"), samples_my_module_url(id: @my_module.id) %>
      • +
    • <%= link_to t("experiments.canvas.popups.manage_samples"), samples_my_module_url(id: @my_module.id) %>
    diff --git a/app/views/user_my_modules/_index.html.erb b/app/views/user_my_modules/_index.html.erb index 893c16b90..2617d4805 100644 --- a/app/views/user_my_modules/_index.html.erb +++ b/app/views/user_my_modules/_index.html.erb @@ -1,8 +1,8 @@ -
    <%=t "projects.canvas.popups.users_tab" %>
    +
    <%=t "experiments.canvas.popups.users_tab" %>
      <% if @user_my_modules.size == 0 then %> -
    • <%= t "projects.canvas.popups.no_users" %>
      • +
    • <%= t "experiments.canvas.popups.no_users" %>
      • <% else %> <% @user_my_modules.each_with_index do |user_my_module, i| %> <% user = user_my_module.user %> @@ -14,9 +14,9 @@
    <%= user.full_name %>
    - "> + "> - <%=t "projects.canvas.popups.module_user_join", date: l(user_my_module.created_at, format: :full_date) %> + <%=t "experiments.canvas.popups.module_user_join", date: l(user_my_module.created_at, format: :full_date) %>
    @@ -28,6 +28,6 @@ <% if can_edit_users_on_module(@my_module) then %>

    - <%= link_to t('projects.canvas.popups.manage_users'), my_module_users_edit_path(@my_module, format: :json), remote: true, class: "manage-users-link" %> + <%= link_to t('experiments.canvas.popups.manage_users'), my_module_users_edit_path(@my_module, format: :json), remote: true, class: "manage-users-link" %>

    <% end %> \ No newline at end of file diff --git a/app/views/user_my_modules/_index_edit.html.erb b/app/views/user_my_modules/_index_edit.html.erb index efdd4d535..6aa5c6991 100644 --- a/app/views/user_my_modules/_index_edit.html.erb +++ b/app/views/user_my_modules/_index_edit.html.erb @@ -1,7 +1,7 @@
      <% if @user_my_modules.size == 0 then %> -
    • <%= t 'projects.canvas.full_zoom.modal_manage_users.no_users' %>
      • +
    • <%= t 'experiments.canvas.full_zoom.modal_manage_users.no_users' %>
      • <% else %> <% @user_my_modules.each_with_index do |umm, i| user = umm.user %>
    • @@ -14,8 +14,8 @@
      <%= user.full_name %> -
      "> - <%=t "projects.canvas.full_zoom.modal_manage_users.user_join", date: l(umm.created_at, format: :full_date) %> +
      "> + <%=t "experiments.canvas.full_zoom.modal_manage_users.user_join", date: l(umm.created_at, format: :full_date) %>
      @@ -43,7 +43,7 @@
      <%= f.button class: 'btn btn-primary' do %> - + <% end %>
      <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index b0ab655cf..12f896e0c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -376,93 +376,6 @@ en: restore_option: "Restore" archived_on: "Archived on" archived_on_title: "Task archived on %{date} at %{time}." - canvas: - head_title: "%{project} | Overview" - canvas_edit: "Edit workflow" - modal_manage_tags: - head_title: "Manage tags for" - subtitle: "Showing tags of task %{module}" - no_tags: "No tags!" - edit_tag: "Edit tag." - remove_tag: "Remove tag from task %{module}." - delete_tag: "Permanently delete tag from all tasks." - save_tag: "Save tag." - cancel_tag: "Cancel changes to the tag." - create: "Add tag" - create_new: "Create new tag" - edit: - new_module: "New task" - new_module_hover: "Drag me onto canvas" - save: "Save workflow" - save_short: "Save" - cancel: "Cancel" - unsaved_work: "Are you sure you want to leave this page? All unsaved data will be lost." - drag_connections: "Drag connection/s from here" - options_header: "Options" - edit_module: "Rename task" - edit_module_group: "Rename workflow" - clone_module: "Clone task" - clone_module_group: "Clone workflow" - delete_module: "Archive task" - delete_module_group: "Archive workflow" - modal_new_module: - title: "Add new task" - name: "Task name" - name_placeholder: "My task" - confirm: "Add task" - error_length: "Name must contain from 2 to 50 characters." - error_invalid: "Name contains invalid characters ('|')." - error_whitespaces: "Name cannot be blank." - modal_edit_module: - title: "Rename task" - name: "Task name" - confirm: "Rename task" - modal_edit_module_group: - title: "Rename workflow" - name: "Workflow name" - confirm: "Rename workflow" - modal_delete_module: - title: "Archive task" - confirm: "Archive task" - message: "Are you sure you wish to archive task %{module}? Task's samples and position will be removed." - modal_delete_module_group: - title: "Archive workflow" - confirm: "Archive workflow" - message: "Are you sure you wish to archive the workflow task %{module} belongs to? All workflow tasks' samples and positions will be removed." - popups: - info_tab: "Task info" - no_description: "This task has no description." - full_info: "Edit description" - users_tab: "Assigned users" - no_users: "This task has no assigned users." - manage_users: "Manage users" - module_user_join: "Joined on %{date}." - module_user_join_full: "%{user} joined on %{date} at %{time}." - activities_tab: "Activity" - no_activities: "No activities!" - more_activities: "All activities" - comments_tab: "Comments" - no_comments: "No comments!" - more_comments: "More Comments" - comment_placeholder: "Your Message" - new_comment: "New comment" - samples_tab: "Samples" - no_samples: "No samples!" - manage_samples: "Manage samples" - full_zoom: - due_date: "Due date" - no_due_date: "not set" - modal_manage_users: - modal_title: "Manage users for" - no_users: "No users" - user_join: "Joined on %{date}." - user_join_full: "%{user} joined on %{date} at %{time}." - create: "Add" - invite_users_link: "Invite users" - invite_users_details: "to team %{organization}." - contact_admins: "To invite additional users to team %{organization}, contact its administrator/s." - update: - success_flash: "Project successfully updated." user_organizations: enums: @@ -678,7 +591,95 @@ en: error_flash: 'Could not update the experiment.' archive: success_flash: "Successfully archived experiment %{experiment}" - error_flash: 'Could not archive the experiment.' + error_flash: 'Could not archive the experiment.' + canvas: + head_title: "%{project} | Overview" + canvas_edit: "Edit workflow" + modal_manage_tags: + head_title: "Manage tags for" + subtitle: "Showing tags of task %{module}" + no_tags: "No tags!" + edit_tag: "Edit tag." + remove_tag: "Remove tag from task %{module}." + delete_tag: "Permanently delete tag from all tasks." + save_tag: "Save tag." + cancel_tag: "Cancel changes to the tag." + create: "Add tag" + create_new: "Create new tag" + edit: + new_module: "New task" + new_module_hover: "Drag me onto canvas" + save: "Save workflow" + save_short: "Save" + cancel: "Cancel" + unsaved_work: "Are you sure you want to leave this page? All unsaved data will be lost." + drag_connections: "Drag connection/s from here" + options_header: "Options" + edit_module: "Rename task" + edit_module_group: "Rename workflow" + clone_module: "Clone task" + clone_module_group: "Clone workflow" + delete_module: "Archive task" + delete_module_group: "Archive workflow" + modal_new_module: + title: "Add new task" + name: "Task name" + name_placeholder: "My task" + confirm: "Add task" + error_length: "Name must contain from 2 to 50 characters." + error_invalid: "Name contains invalid characters ('|')." + error_whitespaces: "Name cannot be blank." + modal_edit_module: + title: "Rename task" + name: "Task name" + confirm: "Rename task" + modal_edit_module_group: + title: "Rename workflow" + name: "Workflow name" + confirm: "Rename workflow" + modal_delete_module: + title: "Archive task" + confirm: "Archive task" + message: "Are you sure you wish to archive task %{module}? Task's samples and position will be removed." + modal_delete_module_group: + title: "Archive workflow" + confirm: "Archive workflow" + message: "Are you sure you wish to archive the workflow task %{module} belongs to? All workflow tasks' samples and positions will be removed." + popups: + info_tab: "Task info" + no_description: "This task has no description." + full_info: "Edit description" + users_tab: "Assigned users" + no_users: "This task has no assigned users." + manage_users: "Manage users" + module_user_join: "Joined on %{date}." + module_user_join_full: "%{user} joined on %{date} at %{time}." + activities_tab: "Activity" + no_activities: "No activities!" + more_activities: "All activities" + comments_tab: "Comments" + no_comments: "No comments!" + more_comments: "More Comments" + comment_placeholder: "Your Message" + new_comment: "New comment" + samples_tab: "Samples" + no_samples: "No samples!" + manage_samples: "Manage samples" + full_zoom: + due_date: "Due date" + no_due_date: "not set" + modal_manage_users: + modal_title: "Manage users for" + no_users: "No users" + user_join: "Joined on %{date}." + user_join_full: "%{user} joined on %{date} at %{time}." + create: "Add" + invite_users_link: "Invite users" + invite_users_details: "to team %{organization}." + contact_admins: "To invite additional users to team %{organization}, contact its administrator/s." + update: + success_flash: "Project successfully updated." + my_module_tags: new: head_title: "%{project} | %{module} | Add tag" diff --git a/config/routes.rb b/config/routes.rb index e755969e6..b4af37a09 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -103,13 +103,13 @@ Rails.application.routes.draw do resources :experiments, only: [:show] do member do - get 'canvas' # Overview/structure for single project + get 'canvas' # Overview/structure for single experiment get 'canvas/edit', to: 'canvas#edit' # AJAX-loaded canvas edit mode (from canvas) get 'canvas/full_zoom', to: 'canvas#full_zoom' # AJAX-loaded canvas zoom get 'canvas/medium_zoom', to: 'canvas#medium_zoom' # AJAX-loaded canvas zoom get 'canvas/small_zoom', to: 'canvas#small_zoom' # AJAX-loaded canvas zoom post 'canvas', to: 'canvas#update' # Save updated canvas action - get 'module_archive' # Module archive for single project + get 'module_archive' # Module archive for single experiment end end