Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-01-20 22:43:10 +01:00
Code Issues Packages Projects Releases Activity

Merged r15416 (#22808).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15419 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2016-05-21 06:50:25 +00:00
parent 513640da15
commit 47fce166d0
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/query.rb
View File

@@ -546,7 +546,7 @@ class Query < ActiveRecord::Base
if grouped? && (column = group_by_column)
order = (sort_criteria_order_for(column.name) || column.default_order).try(:upcase)
column.sortable.is_a?(Array) ?
column.sortable.collect {|s| "#{s} #{order}"}.join(',') :
column.sortable.collect {|s| "#{s} #{order}"} :
"#{column.sortable} #{order}"
end
end

16
test/functional/issues_controller_test.rb
View File

@@ -273,6 +273,22 @@ class IssuesControllerTest < ActionController::TestCase
assert_not_nil assigns(:issue_count_by_group)
end
def test_index_with_query_grouped_and_sorted_by_fixed_version
get :index, :project_id => 1, :set_filter => 1, :group_by => "fixed_version", :sort => "fixed_version"
assert_response :success
assert_template 'index'
assert_not_nil assigns(:issues)
assert_not_nil assigns(:issue_count_by_group)
end
def test_index_with_query_grouped_and_sorted_by_fixed_version_in_reverse_order
get :index, :project_id => 1, :set_filter => 1, :group_by => "fixed_version", :sort => "fixed_version:desc"
assert_response :success
assert_template 'index'
assert_not_nil assigns(:issues)
assert_not_nil assigns(:issue_count_by_group)
end
def test_index_with_query_grouped_by_list_custom_field
get :index, :project_id => 1, :query_id => 9
assert_response :success