scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4845 from aignatov-bio/ai-sci-7758-fix-user-designation-on-creation

Browse source 
Fix user designation on task creation [SCI-7758]
This commit is contained in:
aignatov-bio 2023-01-17 15:12:46 +01:00 committed by GitHub
parent c7dc9efe10 3b6590b8c7
commit 5cbaf83067
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/my_modules_controller.rb
View file

@ -47,9 +47,9 @@ class MyModulesController < ApplicationController
if my_module_tags_params[:tag_ids].present? if my_module_tags_params[:tag_ids].present?
@my_module.tags << @experiment.project.tags.where(id: JSON.parse(my_module_tags_params[:tag_ids])) @my_module.tags << @experiment.project.tags.where(id: JSON.parse(my_module_tags_params[:tag_ids]))
end 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]) @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 @my_module.designated_users << current_user
end end
@my_module.save! @my_module.save!

4
app/permissions/experiment.rb
View file

@ -84,6 +84,10 @@ Canaid::Permissions.register_for(Experiment) do
can :move_experiment do |user, experiment| can :move_experiment do |user, experiment|
experiment.permission_granted?(user, ExperimentPermissions::MANAGE) experiment.permission_granted?(user, ExperimentPermissions::MANAGE)
end end
can :designate_users_to_new_task do |user, experiment|
experiment.permission_granted?(user, MyModulePermissions::DESIGNATED_USERS_MANAGE)
end
end end
Canaid::Permissions.register_for(Protocol) do Canaid::Permissions.register_for(Protocol) do

2
app/views/my_modules/modals/_new_modal.html.erb
View file

@ -55,7 +55,7 @@
</div> </div>
</div> </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="row">
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12"> <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> <label><%= t('experiments.canvas.new_my_module_modal.assigned_users') %></label>