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

Fix showing of inherited roles [SCI-10408] (#7250)

Browse source
This commit is contained in:
ajugo 2024-03-14 18:22:05 +01:00 committed by GitHub
parent 3f4c4dd222
commit de07377b1a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/vue/shared/access_modal/edit.vue
View file

@ -130,12 +130,12 @@ export default {
},
manuallyAssignedUsers() {
return this.assignedUsers.filter((user) => (
user.attributes.assigned === 'manually'
user.attributes?.assigned === 'manually'
));
},
autoAssignedUsers() {
return this.assignedUsers.filter((user) => (
user.attributes.assigned === 'automatically'
user.attributes?.assigned === 'automatically'
));
}
},

6
app/serializers/user_assignment_serializer.rb
View file

@ -8,7 +8,7 @@ class UserAssignmentSerializer < ActiveModel::Serializer
attribute :current_user
def assigned
parent_assignment(parent).assigned
parent_assignment(parent)&.assigned
end
def parent
@ -35,7 +35,7 @@ class UserAssignmentSerializer < ActiveModel::Serializer
end
def last_owner
parent_assignment(parent).last_with_permission?(ProjectPermissions::USERS_MANAGE, assigned: :manually)
parent_assignment(parent)&.last_with_permission?(ProjectPermissions::USERS_MANAGE, assigned: :manually)
end
def inherit_message
@ -60,7 +60,7 @@ class UserAssignmentSerializer < ActiveModel::Serializer
def user_assignment_resource_role_name(user, resource, inherit = '')
user_assignment = resource.user_assignments.find_by(user: user)
return '' if [Project, Protocol].include?(resource.class) && inherit.blank?
return '' if ([Project, Protocol].include?(resource.class) && inherit.blank?) || user_assignment.blank?
if user_assignment.automatically_assigned? && resource.permission_parent.present?
parent = resource.permission_parent