Browse Source

Don't destructively insert builtin_role into roles (#23519).

git-svn-id: http://svn.redmine.org/redmine/trunk@16155 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/3.4.0
Jean-Philippe Lang 7 years ago
parent
commit
eef5023886
1 changed files with 2 additions and 3 deletions
  1. 2
    3
      app/models/user.rb

+ 2
- 3
app/models/user.rb View File

@@ -678,9 +678,8 @@ class User < Principal
return true if admin?

# authorize if user has at least one role that has this permission
rls = self.roles.to_a
rls << builtin_role
rls.any? {|role|
roles = self.roles.to_a | [builtin_role]
roles.any? {|role|
role.allowed_to?(action) &&
(block_given? ? yield(role, self) : true)
}

Loading…
Cancel
Save