summaryrefslogtreecommitdiff
path: root/app/helpers/sorting_helper.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-11-29 14:00:20 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-12-03 11:54:21 +0200
commit40c86cfede43164e9037bac9d712e72c45bd8aea (patch)
treefb140c882ce07a95c1aa5e7d35520fc594ee3978 /app/helpers/sorting_helper.rb
parent0d5cbd16ee3b8eac49d134af063b1827748f2b6d (diff)
downloadgitlab-ce-40c86cfede43164e9037bac9d712e72c45bd8aea.tar.gz
Fix losing search query when sort users on admin users page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/helpers/sorting_helper.rb')
-rw-r--r--app/helpers/sorting_helper.rb12
1 files changed, 12 insertions, 0 deletions
diff --git a/app/helpers/sorting_helper.rb b/app/helpers/sorting_helper.rb
index 8ed2a2ec9f4..74113aee89d 100644
--- a/app/helpers/sorting_helper.rb
+++ b/app/helpers/sorting_helper.rb
@@ -120,6 +120,18 @@ module SortingHelper
}
end
+ def users_sort_options_hash
+ {
+ sort_value_name => sort_title_name,
+ sort_value_recently_signin => sort_title_recently_signin,
+ sort_value_oldest_signin => sort_title_oldest_signin,
+ sort_value_recently_created => sort_title_recently_created,
+ sort_value_oldest_created => sort_title_oldest_created,
+ sort_value_recently_updated => sort_title_recently_updated,
+ sort_value_oldest_updated => sort_title_oldest_updated
+ }
+ end
+
def sortable_item(item, path, sorted_by)
link_to item, path, class: sorted_by == item ? 'is-active' : ''
end