Commit c5e834bb authored by jplang's avatar jplang

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

git-svn-id: https://svn.redmine.org/redmine/trunk@14328 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent df925c11
......@@ -157,6 +157,7 @@ class User < Principal
@notified_projects_ids_changed = false
@builtin_role = nil
@visible_project_ids = nil
@managed_roles = nil
base_reload(*args)
end
......@@ -569,7 +570,7 @@ class User < Principal
# Returns the roles that the user is allowed to manage for the given project
def managed_roles(project)
if admin?
Role.givable.to_a
@managed_roles ||= Role.givable.to_a
else
membership(project).try(:managed_roles) || []
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment