From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 20 Oct 2013 16:04:04 +0000 (+0000)
Subject: Avoid a query if enabled_modules association is already loaded (#15058).
X-Git-Tag: 2.4.0~41
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b48fcdaa9769b9a62611062f0f03d47f92f4c34c;p=redmine.git

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 e2b7a9d9e..d4f29453a 100644
--- 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