From 68206cb591e4aa8eab6fa852fe861b27417ebb65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Zrim=C5=A1ek?= <mzrimsek@biosistemika.com>
Date: Fri, 9 Feb 2018 18:18:41 +0100
Subject: [PATCH] Added missing checks for whether task/experiment/project is
 active for experiment level permissions. Minor code refactoring and
 restyling.

---
 app/permissions/experiment.rb                    |  7 +++++--
 .../canvas/edit/modal/_move_module.html.erb      | 16 ++++++++--------
 config/locales/en.yml                            |  4 ++--
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/permissions/experiment.rb b/app/permissions/experiment.rb
index 4fbcc4e0c..4cf808cc0 100644
--- a/app/permissions/experiment.rb
+++ b/app/permissions/experiment.rb
@@ -43,7 +43,8 @@ Canaid::Permissions.register_for(Experiment) do
      move_experiment)
     .each do |perm|
     can perm do |_, experiment|
-      experiment.project.active?
+      experiment.active? &&
+        experiment.project.active?
     end
   end
 end
@@ -97,7 +98,9 @@ Canaid::Permissions.register_for(MyModule) do
      complete_module
      create_comment_in_module).each do |perm|
     can perm do |_, my_module|
-      my_module.experiment.project.active?
+      my_module.active? &&
+        my_module.experiment.active? &&
+        my_module.experiment.project.active?
     end
   end
 end
diff --git a/app/views/canvas/edit/modal/_move_module.html.erb b/app/views/canvas/edit/modal/_move_module.html.erb
index 1ef56df02..491ba9ff5 100644
--- a/app/views/canvas/edit/modal/_move_module.html.erb
+++ b/app/views/canvas/edit/modal/_move_module.html.erb
@@ -6,7 +6,7 @@
         <h4 class="modal-title" id="modal-move-module-label"><%=t "experiments.canvas.edit.modal_move_module.title" %></h4>
       </div>
       <div class="modal-body">
-        <% experiments = @experiment.project.experiments.is_archived(false) %>
+        <% experiments = @experiment.project.experiments %>
         <% if experiments.count > 1 %>
           <%= bootstrap_form_tag do |f| %>
             <%= f.select :experiment_id, experiments
@@ -14,13 +14,13 @@
                                         .collect { |e| [ e.name, e.id ] }, {},
                 {class: "form-control selectpicker", "data-role" => "clear"} %>
           <% end %>
-      <% else %>
-        <div>
-          <em>
-            <%= t("experiments.canvas.edit.modal_move_module.no_experiments") %>
-          </em>
-        </div>
-      <% end %>
+        <% else %>
+          <div>
+            <em>
+              <%= t("experiments.canvas.edit.modal_move_module.no_experiments") %>
+            </em>
+          </div>
+        <% end %>
       </div>
       <div class="modal-footer">
       <% if experiments.count > 1 %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6db4618fa..5ff556bd8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1907,9 +1907,9 @@ en:
       leave_flash: "Successfuly left team %{team}."
     teams:
       create_permission_error: "You don't have permission to create team."
-      update_permission_error: "You don't have permission to edit team."
+      update_permission_error: "You don't have permission to edit this team."
     user:
       current_password_invalid: "incorrect password"
       password_confirmation_not_match: "doesn't match"
     invite_users:
-      permission_error: "You don't have permission to invite additional users to team. Contact its administrator/s."
+      permission_error: "You don't have permission to invite additional users to this team. Contact its administrator/s."