From 305f4031a48535aca4229de0c5945b247a608c07 Mon Sep 17 00:00:00 2001 From: Ezekiel Kigbo Date: Mon, 17 Jun 2019 12:08:10 +1000 Subject: Added tests for current behaviour --- app/helpers/sorting_helper.rb | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'app/helpers/sorting_helper.rb') diff --git a/app/helpers/sorting_helper.rb b/app/helpers/sorting_helper.rb index 26692934456..ad0d74d7a19 100644 --- a/app/helpers/sorting_helper.rb +++ b/app/helpers/sorting_helper.rb @@ -38,14 +38,12 @@ module SortingHelper # https://gitlab.com/gitlab-org/gitlab-ce/issues/60798 # https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/11209#note_162234858 def old_projects_sort_options_hash - options = { - sort_value_latest_activity => sort_title_latest_activity, - sort_value_name => sort_title_name, + options = projects_sort_common_options_hash.merge({ sort_value_oldest_activity => sort_title_oldest_activity, sort_value_oldest_created => sort_title_oldest_created, sort_value_recently_created => sort_title_recently_created, sort_value_stars_desc => sort_title_most_stars - } + }) if current_controller?('admin/projects') options[sort_value_largest_repo] = sort_title_largest_repo @@ -64,16 +62,12 @@ module SortingHelper end def projects_sort_option_titles - { - sort_value_latest_activity => sort_title_latest_activity, - sort_value_recently_created => sort_title_created_date, - sort_value_name => sort_title_name, - sort_value_stars_desc => sort_title_stars, + projects_sort_common_options_hash.merge({ sort_value_oldest_activity => sort_title_latest_activity, sort_value_oldest_created => sort_title_created_date, sort_value_name_desc => sort_title_name, sort_value_stars_asc => sort_title_stars - } + }) end def projects_reverse_sort_options_hash @@ -237,6 +231,7 @@ module SortingHelper end end + # TODO: dedupicate issuable and project sort direction def project_sort_direction_button(sort_value) link_class = 'btn btn-default has-tooltip reverse-sort-btn qa-reverse-sort' reverse_sort = projects_reverse_sort_options_hash[sort_value] -- cgit v1.2.3