From a4112984ea7047e88e3d36d26d1286b51cbac43e Mon Sep 17 00:00:00 2001
From: Urban Rotnik <urban.rotnik@gmail.com>
Date: Mon, 8 Mar 2021 11:47:45 +0100
Subject: [PATCH] fixup! Add breadcrumbs on Experiments and Tasks pages
---
app/controllers/experiments_controller.rb | 8 --------
app/controllers/my_modules_controller.rb | 7 -------
2 files changed, 15 deletions(-)
diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb
index 90e654ead..869345b4d 100644
--- a/app/controllers/experiments_controller.rb
+++ b/app/controllers/experiments_controller.rb
@@ -7,9 +7,6 @@ class ExperimentsController < ApplicationController
include ApplicationHelper
include Rails.application.routes.url_helpers
- # attr_reader :current_folder
- # helper_method :current_folder
-
before_action :load_project, only: %i(new create archive_group restore_group)
before_action :load_experiment, except: %i(new create archive_group restore_group)
before_action :check_view_permissions, except: %i(edit archive clone move new create archive_group restore_group)
@@ -19,7 +16,6 @@ class ExperimentsController < ApplicationController
before_action :check_clone_permissions, only: %i(clone_modal clone)
before_action :check_move_permissions, only: %i(move_modal move)
before_action :set_inline_name_editing, only: %i(canvas module_archive)
- # before_action :load_current_folder, only: %i(canvas module_archive)
layout 'fluid'
@@ -305,10 +301,6 @@ class ExperimentsController < ApplicationController
render_404 unless @project
end
- # def load_current_folder
- # @current_folder = @experiment.project.project_folder
- # end
-
def experiment_params
params.require(:experiment).permit(:name, :description, :archived)
end
diff --git a/app/controllers/my_modules_controller.rb b/app/controllers/my_modules_controller.rb
index 96769c859..d4206d405 100644
--- a/app/controllers/my_modules_controller.rb
+++ b/app/controllers/my_modules_controller.rb
@@ -6,9 +6,6 @@ class MyModulesController < ApplicationController
include ActionView::Helpers::UrlHelper
include ApplicationHelper
- # attr_reader :current_folder
- # helper_method :current_folder
-
before_action :load_vars, except: %i(restore_group)
before_action :check_archive_permissions, only: %i(update)
before_action :check_manage_permissions, only: %i(description due_date update_description update_protocol_description)
@@ -311,10 +308,6 @@ class MyModulesController < ApplicationController
end
end
- # def load_current_folder
- # @current_folder = @my_module.experiment.project.project_folder
- # end
-
def check_manage_permissions
render_403 && return unless can_manage_module?(@my_module)
end