From 3b6590b8c7066cc42e1c4982c8d7aac02cd6eda8 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Tue, 17 Jan 2023 13:33:04 +0100
Subject: [PATCH] Fix user designation on task creation [SCI-7758]

---
 app/controllers/my_modules_controller.rb        | 4 ++--
 app/permissions/experiment.rb                   | 4 ++++
 app/views/my_modules/modals/_new_modal.html.erb | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/controllers/my_modules_controller.rb b/app/controllers/my_modules_controller.rb
index 51accc76e..f2ac67a1c 100644
--- a/app/controllers/my_modules_controller.rb
+++ b/app/controllers/my_modules_controller.rb
@@ -47,9 +47,9 @@ class MyModulesController < ApplicationController
       if my_module_tags_params[:tag_ids].present?
         @my_module.tags << @experiment.project.tags.where(id: JSON.parse(my_module_tags_params[:tag_ids]))
       end
-      if my_module_designated_users_params[:user_ids].present? && can_manage_my_module_designated_users?(@my_module)
+      if my_module_designated_users_params[:user_ids].present? && can_designate_users_to_new_task?(@experiment)
         @my_module.designated_users << @experiment.users.where(id: my_module_designated_users_params[:user_ids])
-      elsif !can_manage_my_module_designated_users?(@my_module)
+      elsif !can_designate_users_to_new_task?(@experiment)
         @my_module.designated_users << current_user
       end
       @my_module.save!
diff --git a/app/permissions/experiment.rb b/app/permissions/experiment.rb
index 00a7001b8..6279d6dc0 100644
--- a/app/permissions/experiment.rb
+++ b/app/permissions/experiment.rb
@@ -84,6 +84,10 @@ Canaid::Permissions.register_for(Experiment) do
   can :move_experiment do |user, experiment|
     experiment.permission_granted?(user, ExperimentPermissions::MANAGE)
   end
+
+  can :designate_users_to_new_task do |user, experiment|
+    experiment.permission_granted?(user, MyModulePermissions::DESIGNATED_USERS_MANAGE)
+  end
 end
 
 Canaid::Permissions.register_for(Protocol) do
diff --git a/app/views/my_modules/modals/_new_modal.html.erb b/app/views/my_modules/modals/_new_modal.html.erb
index 9b6c5de97..0bebe5596 100644
--- a/app/views/my_modules/modals/_new_modal.html.erb
+++ b/app/views/my_modules/modals/_new_modal.html.erb
@@ -53,7 +53,7 @@
               </div>
             </div>
           </div>
-          <% if can_manage_my_module_designated_users?(@my_module)%>
+          <% if can_designate_users_to_new_task?(@experiment) %>
             <div class="row">
               <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
                 <label><%= t('experiments.canvas.new_my_module_modal.assigned_users') %></label>