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 #4576 from okriuchykhin/ok_SCI_7375

Browse source 
Fix displaying of user access for E/T [SCI-7375]
This commit is contained in:
Alex Kriuchykhin 2022-10-25 16:14:51 +02:00 committed by GitHub
parent 938f2ce63b 232f58dd30
commit d0f604f21e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/views/access_permissions/experiments/modals/_show_modal.html.erb
View file

@ -10,6 +10,7 @@
<div class="modal-body">
<% users.order(full_name: :asc).each do |user| %>
<% user_assignment = experiment.user_assignments.find_by(user: user) %>
<% next if user_assignment.blank? %>
<%= render partial: 'access_permissions/partials/user_assignment', locals: { user_assignment: user_assignment, user: user, resource: experiment } %>
<% end %>
<%= render('access_permissions/partials/default_public_user_role_form', project: experiment.project, editable: false) if experiment.project.visible? %>

2
app/views/access_permissions/experiments/show.json.jbuilder
View file

@ -5,7 +5,7 @@ json.modal controller.render_to_string(
formats: [:html],
locals: {
experiment: @experiment,
users: @experiment.manually_assigned_users,
users: @project.manually_assigned_users,
project_path: project_path(@project)
},
layout: false

1
app/views/access_permissions/my_modules/modals/_show_modal.html.erb
View file

@ -10,6 +10,7 @@
<div class="modal-body">
<% users.order(full_name: :asc).each do |user| %>
<% user_assignment = my_module.user_assignments.find_by(user: user) %>
<% next if user_assignment.blank? %>
<%= render partial: 'access_permissions/partials/user_assignment', locals: { user_assignment: user_assignment, user: user, resource: my_module } %>
<% end %>
<%= render('access_permissions/partials/default_public_user_role_form',

2
app/views/access_permissions/my_modules/show.json.jbuilder
View file

@ -6,7 +6,7 @@ json.modal controller.render_to_string(
locals: {
my_module: @my_module,
experiment: @experiment,
users: @my_module.manually_assigned_users
users: @project.manually_assigned_users
},
layout: false
)