Avoid a query if enabled_modules association is already loaded (#15058).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12228 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/project.rb b/app/models/project.rb
index e2b7a9d9e548c5faa26b4751646b03ffd1a9ff65..d4f29453aaba176aebadffb94fdcee140077b84a 100644 (file)
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -961,7 +961,7 @@ class Project < ActiveRecord::Base
 
   def allowed_permissions
     @allowed_permissions ||= begin
-      module_names = enabled_modules.pluck(:name)
+      module_names = enabled_modules.loaded? ? enabled_modules.map(&:name) : enabled_modules.pluck(:name)
       Redmine::AccessControl.modules_permissions(module_names).collect {|p| p.name}
     end
   end