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

View access modal fixes [SCI-6480] (#3870)

Browse source
This commit is contained in:
artoscinote 2022-02-18 10:19:13 +01:00 • committed by GitHub
parent 37c330586d
commit b9df85869c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,7 +12,7 @@
<% user_assignment = experiment.user_assignments.find_by(user: user) %>
<%= 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: project, editable: false) if project.visible? %>
<%= render('access_permissions/partials/default_public_user_role_form', project: experiment.project, editable: false) if experiment.project.visible? %>
</div>
</div>
</div>

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

@ -12,7 +12,8 @@
<% user_assignment = my_module.user_assignments.find_by(user: user) %>
<%= 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', project: project, editable: false) if project.visible? %>
<%= render('access_permissions/partials/default_public_user_role_form',
project: my_module.experiment.project, editable: false) if my_module.experiment.project.visible? %>
</div>
</div>
</div>

19
app/views/access_permissions/partials/_user_assignment.html.erb
View file

@ -1,15 +1,14 @@
<% # frozen_string_literal: true %>
<div class="row member-item">
<div class="col-xs-2">
<span class="global-avatar-container">
<%= image_tag avatar_path(user, :icon_small), title: current_assignee_name(user), class: 'img-circle pull-left' %>
</span>
</div>
<div class="col-xs-10">
<span><%= current_assignee_name(user) %></span>
<br>
<small class="text-muted"><%= user_assignment_resource_role_name(user, resource) %></small>
<div class="user-assignment-info">
<div class="global-avatar-container">
<%= image_tag avatar_path(user, :icon_small), title: current_assignee_name(user), class: 'img-circle pull-left' %>
</div>
<div>
<%= current_assignee_name(user) %>
<br>
<small class="text-muted"><%= user_assignment_resource_role_name(user, resource) %></small>
</div>
</div>
</div>