scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-11 06:16:32 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4834 from aignatov-bio/ai-sci-7758-hide-assigned-users-for-users-without-permissions

Browse source 
Hide assigned users for user without permissions [SCI-7758]
This commit is contained in:
aignatov-bio 2023-01-16 11:34:50 +01:00 • committed by GitHub
commit 4f952e69b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 20 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,8 +47,10 @@ 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? if my_module_designated_users_params[:user_ids].present? && can_manage_my_module_designated_users?(@my_module)
@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)
@my_module.designated_users << current_user
end end
@my_module.save! @my_module.save!
Activities::CreateActivityService.call( Activities::CreateActivityService.call(

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

@ -53,26 +53,26 @@
</div> </div>
</div> </div>
</div> </div>
<% if can_manage_my_module_designated_users?(@my_module)%>
<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>
<%= select_tag 'my_module[user_ids]', <%= select_tag 'my_module[user_ids]',
options_for_select(users.map{ |user| options_for_select(users.map{ |user|
[ [
user.full_name, user.full_name,
user.id, user.id,
{'data-params' => {avatar_url: avatar_path(user, :icon_small) }.to_json} {'data-params' => {avatar_url: avatar_path(user, :icon_small) }.to_json}
] ]
}), }),
data: { data: {
'placeholder': t('experiments.canvas.new_my_module_modal.assigned_users_placeholder') 'placeholder': t('experiments.canvas.new_my_module_modal.assigned_users_placeholder')
}, },
multiple: true multiple: true
%> %>
</div>
</div> </div>
</div> <% end %>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal"> <button type="button" class="btn btn-secondary" data-dismiss="modal">