jro_apps/redmine Commit - r4451:902d765ab7ec

Merged r4553 from trunk....

Jean-Philippe Lang -

r4451:902d765ab7ec

parent child

Context file:

r4451:902d765ab7ec

app/models/query.rb +3 -3

                # 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

test/unit/query_test.rb +16 0

                  q = Query.new
                  assert q.groupable_columns.detect {|c| c.is_a? QueryCustomFieldColumn}
                end
+               def test_grouped_with_valid_column
+                 q = Query.new(:group_by => 'status')
+                 assert q.grouped?
+                 assert_not_nil q.group_by_column
+                 assert_equal :status, q.group_by_column.name
+                 assert_not_nil q.group_by_statement
+                 assert_equal 'status', q.group_by_statement
+               end
+               def test_grouped_with_invalid_column
+                 q = Query.new(:group_by => 'foo')
+                 assert !q.grouped?
+                 assert_nil q.group_by_column
+                 assert_nil q.group_by_statement
+               end
                def test_default_sort
                  q = Query.new

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages