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

Merge pull request #4947 from aignatov-bio/ai-sci-7882-add-inherit-permission-label

Browse source 
Add inherit information to access modal [SCI-7882]
This commit is contained in:
aignatov-bio 2023-02-09 11:33:39 +01:00 committed by GitHub
parent 193ff7bc46 a679e0ea62
commit 82c63d3adc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/access_permissions/access_modal.scss
View file

@ -28,6 +28,10 @@
.user-assignment-controls {
align-items: center;
display: flex;
.text-muted {
color: $color-silver-chalice;
}
}
.user-assignment-controls {

11
app/helpers/user_assignments_helper.rb
View file

@ -12,15 +12,14 @@ module UserAssignmentsHelper
def user_assignment_resource_role_name(user, resource, inherit = '')
user_assignment = resource.user_assignments.find_by(user: user)
if ![Project, Protocol].include?(resource.class) && user_assignment.automatically_assigned?
return '' if [Project, Protocol].include?(resource.class) && inherit.blank?
if user_assignment.automatically_assigned?
parent = resource.permission_parent
return user_assignment_resource_role_name(user, parent, '_inherit')
end
"#{user_assignment.user_role.name}
<span class='permission-object-tag'
title='#{t("access_permissions.partials.#{resource.class.to_s.downcase}_tooltip#{inherit}")}'>
#{t("access_permissions.partials.#{resource.class.to_s.downcase}")}
</span>".html_safe
t("access_permissions.partials.#{resource.class.to_s.downcase}_tooltip#{inherit}")
end
end

2
app/views/access_permissions/partials/_member_field.html.erb
View file

@ -13,6 +13,8 @@
</div>
<div>
<%= current_assignee_name(user) %>
<br>
<small class="text-muted"><%= user_assignment_resource_role_name(user, object) %></small>
</div>
</div>
<div class="user-assignment-controls">