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

Merge pull request #8788 from artoscinote/ma_SCI_12249

Browse source 
Fix permission team scoping [SCI-2249]
This commit is contained in:
Martin Artnik 2025-08-13 16:42:56 +02:00 • committed by GitHub
commit 4106ae7d55
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/concerns/permission_checkable_model.rb
View file

@ -50,7 +50,7 @@ module PermissionCheckableModel
end end
user_roles = UserRole.left_outer_joins(:team_assignments, user_group_assignments: { user_group: :users }) user_roles = UserRole.left_outer_joins(:team_assignments, user_group_assignments: { user_group: :users })
user_roles.where(user_group_assignments: { assignable: self, user_groups: { users: user } }) user_roles.where(user_group_assignments: { assignable: self, user_groups: { users: user }, team: permission_team })
.or(user_roles.where(team_assignments: { assignable: self, team: permission_team })) .or(user_roles.where(team_assignments: { assignable: self, team: permission_team }))
.exists?(['user_roles.permissions @> ARRAY[?]::varchar[]', [permission]]) .exists?(['user_roles.permissions @> ARRAY[?]::varchar[]', [permission]])
end end

2
app/serializers/concerns/assignments_helper.rb
View file

@ -11,7 +11,7 @@ module AssignmentsHelper
} }
end end
user_groups = object.user_group_assignments.map do |ua| user_groups = object.user_group_assignments.where(team: current_user.current_team).map do |ua|
{ {
avatar: ActionController::Base.helpers.asset_path('icon/group.svg'), avatar: ActionController::Base.helpers.asset_path('icon/group.svg'),
full_name: ua.user_group_name_with_role full_name: ua.user_group_name_with_role