diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2010-12-21 21:46:54 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2010-12-21 21:46:54 +0000 |
| commit | 703b0ec422bbb9bac775254e8e284a4b145551e2 (patch) | |
| tree | ab10ca58156f7467be21335d11666f2150467c9f /app/models/query.rb | |
| parent | 3d76a67a2e108ea64618670d4ece5de0c2253436 (diff) | |
| download | redmine-703b0ec422bbb9bac775254e8e284a4b145551e2.tar.gz redmine-703b0ec422bbb9bac775254e8e284a4b145551e2.zip | |
Fixed: 500 error on issue query grouped by a custom field that was deleted (#7144).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4553 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/query.rb')
| -rw-r--r-- | app/models/query.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/query.rb b/app/models/query.rb index 949054533..1f033048a 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -378,15 +378,15 @@ class Query < ActiveRecord::Base # Returns true if the query is a grouped query def grouped? - !group_by.blank? + !group_by_column.nil? end def group_by_column - groupable_columns.detect {|c| c.name.to_s == group_by} + groupable_columns.detect {|c| c.groupable && c.name.to_s == group_by} end def group_by_statement - group_by_column.groupable + group_by_column.try(:groupable) end def project_statement |