Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-06 05:16:12 +01:00
Code Issues Packages Projects Releases Activity

Prevent roles loading on each call to User#managed_roles for admins.

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@14328 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2015-06-17 18:36:38 +00:00
parent 0d1da58a99
commit ba61b13008
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/user.rb
View File

@@ -157,6 +157,7 @@ class User < Principal
@notified_projects_ids_changed = false @notified_projects_ids_changed = false
@builtin_role = nil @builtin_role = nil
@visible_project_ids = nil @visible_project_ids = nil
@managed_roles = nil
base_reload(*args) base_reload(*args)
end end
@@ -569,7 +570,7 @@ class User < Principal
# Returns the roles that the user is allowed to manage for the given project # Returns the roles that the user is allowed to manage for the given project
def managed_roles(project) def managed_roles(project)
if admin? if admin?
Role.givable.to_a @managed_roles ||= Role.givable.to_a
else else
membership(project).try(:managed_roles) || [] membership(project).try(:managed_roles) || []
end end