From edafcaeed681e7e16ed53ad2de95e34e1f25aaa6 Mon Sep 17 00:00:00 2001
From: Luka Murn <luka.murn@biosistemika.com>
Date: Thu, 28 Jul 2016 11:05:28 +0200
Subject: [PATCH] Move route module_archive_project ->
 module_archive_experiment

Also add some new routes, move some templates.
---
 app/controllers/projects_controller.rb              | 13 ++++++-------
 app/helpers/permission_helper.rb                    | 12 +++++++++++-
 app/helpers/sidebar_helper.rb                       |  2 +-
 ...archive.html.erb => experiment_archive.html.erb} |  0
 .../results/partials/_my_module_text.html.erb       |  4 ++--
 app/views/shared/_secondary_navigation.html.erb     |  2 +-
 6 files changed, 21 insertions(+), 12 deletions(-)
 rename app/views/projects/{module_archive.html.erb => experiment_archive.html.erb} (100%)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 0c5242da5..d6edad815 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -4,14 +4,14 @@ class ProjectsController < ApplicationController
 
   before_action :load_vars, only: [:show, :edit, :update,
                                    :notifications, :reports,
-                                   :samples, :module_archive,
+                                   :samples, :experiment_archive,
                                    :delete_samples, :samples_index]
   before_action :check_view_permissions, only: [:show, :reports,
-                                                :samples, :module_archive,
+                                                :samples, :experiment_archive,
                                                 :samples_index]
   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_experiment_archive_permissions, only: [:experiment_archive]
 
   filter_by_archived = false
 
@@ -259,8 +259,7 @@ class ProjectsController < ApplicationController
     @organization = @project.organization
   end
 
-  def module_archive
-
+  def experiment_archive
   end
 
   def samples_index
@@ -306,8 +305,8 @@ class ProjectsController < ApplicationController
     end
   end
 
-  def check_module_archive_permissions
-    unless can_restore_archived_modules(@project)
+  def check_experiment_archive_permissions
+    unless can_view_project_archive(@project)
       render_403
     end
   end
diff --git a/app/helpers/permission_helper.rb b/app/helpers/permission_helper.rb
index cd181e8c8..42ca279f2 100644
--- a/app/helpers/permission_helper.rb
+++ b/app/helpers/permission_helper.rb
@@ -118,7 +118,13 @@ module PermissionHelper
       :can_edit_result_asset_in_module,
       :can_archive_result_asset_in_module,
       :can_add_samples_to_module,
-      :can_delete_samples_from_module
+      :can_delete_samples_from_module,
+      :can_create_experiment,
+      :can_edit_experiment,
+      :can_view_experiment,
+      :can_view_experiment_archive,
+      :can_archive_experiment,
+      :can_restore_experiment
     ] do |proxy, *args, &block|
       if args[0]
         my_module = args[0]
@@ -313,6 +319,10 @@ module PermissionHelper
     can_view_project(experiment.project)
   end
 
+  def can_view_experiment_archive(experiment)
+    can_view_project(experiment.project)
+  end
+
   def can_archive_experiment(project)
     is_user_or_higher_of_project(project)
   end
diff --git a/app/helpers/sidebar_helper.rb b/app/helpers/sidebar_helper.rb
index 93afa232d..9bd427508 100644
--- a/app/helpers/sidebar_helper.rb
+++ b/app/helpers/sidebar_helper.rb
@@ -13,7 +13,7 @@ module SidebarHelper
     when "samples"
       return samples_project_path(project)
     when "archive"
-      return module_archive_project_url(project)
+      return experiment_archive_project_url(project)
     else
       return project_path(project)
     end
diff --git a/app/views/projects/module_archive.html.erb b/app/views/projects/experiment_archive.html.erb
similarity index 100%
rename from app/views/projects/module_archive.html.erb
rename to app/views/projects/experiment_archive.html.erb
diff --git a/app/views/search/results/partials/_my_module_text.html.erb b/app/views/search/results/partials/_my_module_text.html.erb
index 90e0ef2b8..92ea8ce05 100644
--- a/app/views/search/results/partials/_my_module_text.html.erb
+++ b/app/views/search/results/partials/_my_module_text.html.erb
@@ -4,8 +4,8 @@
 
 <% if my_module.archived? %>
   <span class="label label-warning"><%=t "search.index.archived" %></span>
-  <% if can_view_project_archive(my_module.experiment.project) and can_restore_module(my_module) %>
-    <a href="<%= module_archive_project_url(my_module.experiment.project) %>">
+  <% if can_view_experiment_archive(my_module.experiment) and can_restore_module(my_module) %>
+    <a href="<%= module_archive_experiment_url(my_module.experiment) %>">
       <%= text %>
     </a>
   <% else %>
diff --git a/app/views/shared/_secondary_navigation.html.erb b/app/views/shared/_secondary_navigation.html.erb
index e29976bab..31df1baf2 100644
--- a/app/views/shared/_secondary_navigation.html.erb
+++ b/app/views/shared/_secondary_navigation.html.erb
@@ -76,7 +76,7 @@
           <% end %>
           <% if can_view_project_archive(@project) then %>
             <li id="project-archive-nav-tab" class="<%= "active" if is_project_archive? %>">
-              <a href="<%= module_archive_project_url(@project) %>"><span class="glyphicon glyphicon-briefcase"></span></a>
+              <a href="<%= experiment_archive_project_url(@project) %>"><span class="glyphicon glyphicon-briefcase"></span></a>
             </li>
           <% end %>