diff options
author | Robert Speicher <robert@gitlab.com> | 2016-08-15 21:46:04 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-08-15 21:46:04 +0000 |
commit | dd2088b08dd89001c8b0da387bd1c928f6c69153 (patch) | |
tree | 1a42b2c189b74247616ccd619e577755ce4d46a1 | |
parent | 804fa437581713608a714ae0a3912d44e0a1d026 (diff) | |
parent | 7638ebe4236cfdd0e7a76f87ba077acf57a7e806 (diff) | |
download | gitlab-ce-dd2088b08dd89001c8b0da387bd1c928f6c69153.tar.gz |
Merge branch '20317-admin-cant-order-by-size' into 'master'
Allow to sort by project size on admin projects page
Fixes #20317
See merge request !5797
-rw-r--r-- | app/helpers/sorting_helper.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/helpers/sorting_helper.rb b/app/helpers/sorting_helper.rb index e1c0b497550..8b138a8e69f 100644 --- a/app/helpers/sorting_helper.rb +++ b/app/helpers/sorting_helper.rb @@ -20,13 +20,19 @@ module SortingHelper end def projects_sort_options_hash - { + options = { sort_value_name => sort_title_name, sort_value_recently_updated => sort_title_recently_updated, sort_value_oldest_updated => sort_title_oldest_updated, sort_value_recently_created => sort_title_recently_created, sort_value_oldest_created => sort_title_oldest_created, } + + if current_controller?('admin/projects') + options.merge!(sort_value_largest_repo => sort_title_largest_repo) + end + + options end def sort_title_priority |