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

Merge pull request #4567 from okriuchykhin/ok_SCI_7375

Browse source 
Fix display of user access for experiments and tasks [SCI-7375]
This commit is contained in:
Alex Kriuchykhin 2022-10-24 13:05:02 +02:00 committed by GitHub
parent d4cb8de300 09440d4f83
commit 60dc26a42b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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.users,
users: @experiment.manually_assigned_users,
project_path: project_path(@project)
},
layout: false

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.users
users: @my_module.manually_assigned_users
},
layout: false
)

8
app/views/access_permissions/partials/_default_public_user_role_form.html.erb
View file

@ -4,11 +4,11 @@
<%= image_tag "icon/team.png", class: 'img-circle pull-left' %>
</div>
<div>
<%= t('access_permissions.everyone_else', team_name: f.object.team.name) %>
<%= render 'access_permissions/partials/public_members_dropdown', team: f.object.team, project: project %>
<%= t('access_permissions.everyone_else', team_name: project.team.name) %>
<%= render 'access_permissions/partials/public_members_dropdown', team: project.team, project: project %>
<br>
<small class="text-muted">
<%= f.object.default_public_user_role.name %>
<%= project.default_public_user_role.name %>
<span class="permission-object-tag" title="<%= t("access_permissions.partials.project_tooltip") %>"">
<%= t("access_permissions.partials.project") %>
</span>
@ -18,7 +18,7 @@
<div class="user-assignment-controls">
<div class="user-assignment-role">
<% if editable %>
<%= f.select :default_public_user_role_id, options_for_select(user_roles_collection, selected: f.object.default_public_user_role_id), {}, class: 'form-control selectpicker', title: t('user_assignment.change_project_role'), data: { 'selected-text-format' => 'static' } %>
<%= f.select :default_public_user_role_id, options_for_select(user_roles_collection, selected: project.default_public_user_role_id), {}, class: 'form-control selectpicker', title: t('user_assignment.change_project_role'), data: { 'selected-text-format' => 'static' } %>
<% end %>
</div>
<div class="user-assignment-remove">