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

Merge pull request #4496 from okriuchykhin/ok_SCI_7290

Browse source 
Fix user role loading for Team in permission checking concern [SCI-7290]
This commit is contained in:
Alex Kriuchykhin 2022-10-06 15:45:48 +02:00 • committed by GitHub
commit 9152cee31f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,10 +25,11 @@ module PermissionCheckableModel
def load_user_role_permissions(user)
if user_assignments.loaded?
user_assignments.detect do |user_assignment|
user_assignment.user == user && user_assignment.team == user.current_team
user_assignment.user == user && (is_a?(Team) || user_assignment.team == user.current_team)
end&.user_role&.permissions
else
user_assignments.find_by(user: user, team: user.current_team)&.user_role&.permissions
load_criteria = is_a?(Team) ? { user: user } : { user: user, team: user.current_team }
user_assignments.find_by(load_criteria)&.user_role&.permissions
end
end
end