From 0f0689eddcc1c103f3023a16874180185e3b49bc Mon Sep 17 00:00:00 2001
From: Luka Murn <luka.murn@biosistemika.com>
Date: Fri, 29 Jul 2016 11:43:15 +0200
Subject: [PATCH] Fix permission helper

---
 app/helpers/permission_helper.rb | 37 ++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/app/helpers/permission_helper.rb b/app/helpers/permission_helper.rb
index 42ca279f2..162d332b3 100644
--- a/app/helpers/permission_helper.rb
+++ b/app/helpers/permission_helper.rb
@@ -69,7 +69,8 @@ module PermissionHelper
       :can_archive_modules,
       :can_view_reports,
       :can_create_new_report,
-      :can_delete_reports
+      :can_delete_reports,
+      :can_create_experiment
     ] do |proxy, *args, &block|
       if args[0]
         project = args[0]
@@ -118,8 +119,23 @@ 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_create_experiment,
+      :can_delete_samples_from_module
+    ] do |proxy, *args, &block|
+      if args[0]
+        my_module = args[0]
+        if my_module.active? &&
+           my_module.experiment.active? &&
+           my_module.experiment.project.active?
+          proxy.call(*args, &block)
+        else
+          false
+        end
+      else
+        false
+      end
+    end
+
+    around [
       :can_edit_experiment,
       :can_view_experiment,
       :can_view_experiment_archive,
@@ -127,10 +143,9 @@ module PermissionHelper
       :can_restore_experiment
     ] do |proxy, *args, &block|
       if args[0]
-        my_module = args[0]
-        if my_module.active? &&
-           my_module.experiment.project.active? &&
-           my_module.experiment.active?
+        experiment = args[0]
+        if experiment.active? &&
+           experiment.project.active?
           proxy.call(*args, &block)
         else
           false
@@ -311,8 +326,8 @@ module PermissionHelper
     is_user_or_higher_of_project(project)
   end
 
-  def can_edit_experiment(project)
-    is_user_or_higher_of_project(project)
+  def can_edit_experiment(experiment)
+    is_user_or_higher_of_project(experiment.project)
   end
 
   def can_view_experiment(experiment)
@@ -323,8 +338,8 @@ module PermissionHelper
     can_view_project(experiment.project)
   end
 
-  def can_archive_experiment(project)
-    is_user_or_higher_of_project(project)
+  def can_archive_experiment(experiment)
+    is_user_or_higher_of_project(experiment.project)
   end
 
   def can_restore_experiment(experiment)