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

Remove duplicate keys from sort criteria (#32737).

Browse Source 
Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/trunk@19636 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2020-04-02 06:22:23 +00:00
parent fd75ebcd12
commit c5ec830b68
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/redmine/sort_criteria.rb
View File

@@ -90,6 +90,7 @@ module Redmine
def normalize! def normalize!
self.reject! {|s| s.first.blank? } self.reject! {|s| s.first.blank? }
self.uniq! {|s| s.first }
self.collect! {|s| s = Array(s); [s.first, (s.last == false || s.last.to_s == 'desc') ? 'desc' : 'asc']} self.collect! {|s| s = Array(s); [s.first, (s.last == false || s.last.to_s == 'desc') ? 'desc' : 'asc']}
self.replace self.first(3) self.replace self.first(3)
end end

6
test/unit/query_test.rb
View File

@@ -1640,12 +1640,12 @@ class QueryTest < ActiveSupport::TestCase
def test_sort_criteria_should_have_only_first_three_elements def test_sort_criteria_should_have_only_first_three_elements
q = IssueQuery.new q = IssueQuery.new
q.sort_criteria = [['priority', 'desc'], ['tracker', 'asc'], ['priority', 'asc'], ['id', 'asc'], ['project', 'asc'], ['subject', 'asc']] 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 end
def test_sort_criteria_should_remove_blank_keys def test_sort_criteria_should_remove_blank_or_duplicate_keys
q = IssueQuery.new 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 assert_equal [['priority', 'desc'], ['project', 'asc']], q.sort_criteria
end end