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
2010-12-21 21:46:54 +00:00
parent 3d76a67a2e
commit 703b0ec422
2 changed files with 19 additions and 3 deletions
@@ -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