Commit 7ba0a7da authored by maeda's avatar maeda

Redmine::SortCriteria#normalize! does not limit properly the maximum number of elements (#29632).

Patch by Mizuki ISHIKAWA.


git-svn-id: https://svn.redmine.org/redmine/trunk@17494 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 290170e2
......@@ -88,8 +88,7 @@ module Redmine
def normalize!
self.collect! {|s| s = Array(s); [s.first, (s.last == false || s.last.to_s == 'desc') ? 'desc' : 'asc']}
self.slice!(3)
self
self.replace self.first(3)
end
# Appends ASC/DESC to the sort criterion unless it has a fixed order
......
......@@ -1490,6 +1490,12 @@ class QueryTest < ActiveSupport::TestCase
assert_equal [['id', 'desc']], q.sort_criteria
end
def test_sort_criteria_should_have_only_first_three_elements
q = IssueQuery.new
q.sort_criteria = [['priority', 'desc'], ['tracker', 'asc'], ['priority', 'asc'], ['id', 'asc'], ['project', 'asc'], ['subject', 'asc']]
assert_equal [['priority', 'desc'], ['tracker', 'asc'], ['priority', 'asc']], q.sort_criteria
end
def test_set_sort_criteria_with_hash
q = IssueQuery.new
q.sort_criteria = {'0' => ['priority', 'desc'], '2' => ['tracker']}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment