diff options
| author | Go MAEDA <maeda@farend.jp> | 2020-04-02 06:22:23 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2020-04-02 06:22:23 +0000 |
| commit | c5ec830b68b7a3f34af2b70cc876451e43dbc603 (patch) | |
| tree | 2b1ae9c8c6179ecdc70ba80d08f8c21a2c770b2f | |
| parent | fd75ebcd12cb39f14b16dc7e98df4f39969bc885 (diff) | |
| download | redmine-c5ec830b68b7a3f34af2b70cc876451e43dbc603.tar.gz redmine-c5ec830b68b7a3f34af2b70cc876451e43dbc603.zip | |
Remove duplicate keys from sort criteria (#32737).
Patch by Go MAEDA.
git-svn-id: http://svn.redmine.org/redmine/trunk@19636 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | lib/redmine/sort_criteria.rb | 1 | ||||
| -rw-r--r-- | test/unit/query_test.rb | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/redmine/sort_criteria.rb b/lib/redmine/sort_criteria.rb index efe40514b..4de81900e 100644 --- a/lib/redmine/sort_criteria.rb +++ b/lib/redmine/sort_criteria.rb @@ -90,6 +90,7 @@ module Redmine def normalize! 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.replace self.first(3) end diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb index d20fefce4..0759a447b 100644 --- a/test/unit/query_test.rb +++ b/test/unit/query_test.rb @@ -1640,12 +1640,12 @@ class QueryTest < ActiveSupport::TestCase 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 |