diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-12-12 12:57:42 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2018-12-14 12:04:23 +0000 |
| commit | 2d123a5075af2f73a1a4ea7ae60bea70e468e522 (patch) | |
| tree | 10d188df62b47bf865264fa5418a673c378fd21c | |
| parent | 5035156da2a392301641583d6a72d3b902e0463f (diff) | |
| download | gitlab-ce-2d123a5075af2f73a1a4ea7ae60bea70e468e522.tar.gz | |
Merge branch 'issue_55133' into 'master'
Fix issuables sort direction button parameters
Closes #55133
See merge request gitlab-org/gitlab-ce!23744
(cherry picked from commit 4dfe717848c4541b32cec887a1386fbc88ee0633)
61ad1da1 Fix issuables sort direction button parameters
| -rw-r--r-- | app/helpers/sorting_helper.rb | 2 | ||||
| -rw-r--r-- | spec/helpers/sorting_helper_spec.rb | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/helpers/sorting_helper.rb b/app/helpers/sorting_helper.rb index f51b96ba8ce..67c808b167a 100644 --- a/app/helpers/sorting_helper.rb +++ b/app/helpers/sorting_helper.rb @@ -164,7 +164,7 @@ module SortingHelper reverse_sort = issuable_reverse_sort_order_hash[sort_value] if reverse_sort - reverse_url = page_filter_path(sort: reverse_sort) + reverse_url = page_filter_path(sort: reverse_sort, label: true) else reverse_url = '#' link_class += ' disabled' diff --git a/spec/helpers/sorting_helper_spec.rb b/spec/helpers/sorting_helper_spec.rb index cba0d93e144..f405268d198 100644 --- a/spec/helpers/sorting_helper_spec.rb +++ b/spec/helpers/sorting_helper_spec.rb @@ -21,7 +21,11 @@ describe SortingHelper do describe '#issuable_sort_direction_button' do before do - allow(self).to receive(:request).and_return(double(path: 'http://test.com', query_parameters: {})) + allow(self).to receive(:request).and_return(double(path: 'http://test.com', query_parameters: { label_name: 'test_label' })) + end + + it 'keeps label filter param' do + expect(issuable_sort_direction_button('created_date')).to include('label_name=test_label') end it 'returns icon with sort-highest when sort is created_date' do |