From 6edda2fd2f036067c9872671a1958c6bfff33095 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 21 May 2016 06:50:38 +0000 Subject: [PATCH] Merged r15416 (#22808). git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15420 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/query.rb | 2 +- test/functional/issues_controller_test.rb | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/app/models/query.rb b/app/models/query.rb index 512dbfe21..fd5e2753b 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -514,7 +514,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 diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index d196e6c7d..c39b1d287 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -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 -- 2.39.5