diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-26 22:20:10 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-26 22:20:10 +0000 |
| commit | 05462a145f33e9e749033d8e6331e2146a037321 (patch) | |
| tree | 307edc538ffb8865448438d59118b39e385e01a9 /app | |
| parent | 46d4d75ccdb6f0b6216cfae2820e9e8ffecce8bc (diff) | |
| download | redmine-05462a145f33e9e749033d8e6331e2146a037321.tar.gz redmine-05462a145f33e9e749033d8e6331e2146a037321.zip | |
Prevents useless COUNT queries.
git-svn-id: http://svn.redmine.org/redmine/trunk@13514 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/issue.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb index 6d5d27631..31b2d69f1 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -541,11 +541,11 @@ class Issue < ActiveRecord::Base return @workflow_rule_by_attribute if @workflow_rule_by_attribute && user.nil? user_real = user || User.current - roles = user_real.admin ? Role.all : user_real.roles_for_project(project) + roles = user_real.admin ? Role.all.to_a : user_real.roles_for_project(project) return {} if roles.empty? result = {} - workflow_permissions = WorkflowPermission.where(:tracker_id => tracker_id, :old_status_id => status_id, :role_id => roles.map(&:id)) + workflow_permissions = WorkflowPermission.where(:tracker_id => tracker_id, :old_status_id => status_id, :role_id => roles.map(&:id)).to_a if workflow_permissions.any? workflow_rules = workflow_permissions.inject({}) do |h, wp| h[wp.field_name] ||= [] |