32737-remove-duplicate-keys.patch - Redmine

Defect #32737 » 32737-remove-duplicate-keys.patch

Go MAEDA, 2020-01-27 12:58

lib/redmine/sort_criteria.rb
90	90
91	91	def normalize!
92	92	self.reject! {\|s\| s.first.blank? }
	93	self.uniq! {\|s\| s.first }
93	94	self.collect! {\|s\| s = Array(s); [s.first, (s.last == false \|\| s.last.to_s == 'desc') ? 'desc' : 'asc']}
94	95	self.replace self.first(3)
95	96	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
         assert_equal [['priority', 'desc'], ['tracker', 'asc'], ['id', 'asc']], q.sort_criteria
       end
       def test_sort_criteria_should_remove_blank_keys
       def test_sort_criteria_should_remove_blank_or_duplicate_keys
         q = IssueQuery.new
         q.sort_criteria = [['priority', 'desc'], [nil, 'desc'], ['', 'asc'], ['project', 'asc']]
         q.sort_criteria = [['priority', 'desc'], [nil, 'desc'], ['', 'asc'], ['priority', 'asc'], ['project', 'asc']]
         assert_equal [['priority', 'desc'], ['project', 'asc']], q.sort_criteria
       end

(3-3/4)