Merged r17638 from trunk to 3.4-stable (#30009).

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17639 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 7 insertions, 0 deletions

diff --git a/lib/redmine/sort_criteria.rb b/lib/redmine/sort_criteria.rb
index 3d440f010..d8fa3ee3d 100644
--- a/lib/redmine/sort_criteria.rb
+++ b/lib/redmine/sort_criteria.rb
@@ -87,6 +87,7 @@ module Redmine
     private
 
     def normalize!
+      self.reject! {|s| s.first.blank? }
       self.collect! {|s| s = Array(s); [s.first, (s.last == false || s.last.to_s == 'desc') ? 'desc' : 'asc']}
       self.slice!(3)
       self
diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb
index dfa2ace6d..c7c8e97f7 100644
--- a/test/unit/query_test.rb
+++ b/test/unit/query_test.rb
@@ -1490,6 +1490,12 @@ class QueryTest < ActiveSupport::TestCase
     assert_equal [['id', 'desc']], q.sort_criteria
   end
 
+  def test_sort_criteria_should_remove_blank_keys
+    q = IssueQuery.new
+    q.sort_criteria = [['priority', 'desc'], [nil, 'desc'], ['', 'asc'], ['project', 'asc']]
+    assert_equal [['priority', 'desc'], ['project', 'asc']], q.sort_criteria
+  end
+
   def test_set_sort_criteria_with_hash
     q = IssueQuery.new
     q.sort_criteria = {'0' => ['priority', 'desc'], '2' => ['tracker']}