From de07377b1a17fe20858e93424e4fbbbb092b2481 Mon Sep 17 00:00:00 2001 From: ajugo Date: Thu, 14 Mar 2024 18:22:05 +0100 Subject: [PATCH] Fix showing of inherited roles [SCI-10408] (#7250) --- app/javascript/vue/shared/access_modal/edit.vue | 4 ++-- app/serializers/user_assignment_serializer.rb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/javascript/vue/shared/access_modal/edit.vue b/app/javascript/vue/shared/access_modal/edit.vue index 1a539c81d..f85ee7bd3 100644 --- a/app/javascript/vue/shared/access_modal/edit.vue +++ b/app/javascript/vue/shared/access_modal/edit.vue @@ -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' )); } }, diff --git a/app/serializers/user_assignment_serializer.rb b/app/serializers/user_assignment_serializer.rb index 4b86670e1..d057befb2 100644 --- a/app/serializers/user_assignment_serializer.rb +++ b/app/serializers/user_assignment_serializer.rb @@ -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