Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-04-06 13:22:04 +0300
committerRémy Coutable <remy@rymai.me>2017-04-06 13:22:04 +0300
commit32db15b24b8c69e39451f4afb951c993f9fbf31e (patch)
tree76e0f408dbbebe52e95824b1aa1e030b3a819fdb /app/helpers
parentd7e3f2322fd0ad632687f2f27a1cf2aac5474ac9 (diff)
parentb996a82ff44e3bcad5e5fb70cabbfa808d06cf62 (diff)
Merge branch '28810-projectfinder-should-handle-more-options' into 'master'
ProjectsFinder should handle more options Closes #28810 See merge request !9682
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/sorting_helper.rb20
1 files changed, 18 insertions, 2 deletions
diff --git a/app/helpers/sorting_helper.rb b/app/helpers/sorting_helper.rb
index 5c89cbea3fc..3a5d1b97c36 100644
--- a/app/helpers/sorting_helper.rb
+++ b/app/helpers/sorting_helper.rb
@@ -25,8 +25,8 @@ module SortingHelper
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_latest_activity => sort_title_latest_activity,
+ sort_value_oldest_activity => sort_title_oldest_activity,
sort_value_recently_created => sort_title_recently_created,
sort_value_oldest_created => sort_title_oldest_created
}
@@ -78,6 +78,14 @@ module SortingHelper
'Last updated'
end
+ def sort_title_oldest_activity
+ 'Oldest updated'
+ end
+
+ def sort_title_latest_activity
+ 'Last updated'
+ end
+
def sort_title_oldest_created
'Oldest created'
end
@@ -198,6 +206,14 @@ module SortingHelper
'updated_desc'
end
+ def sort_value_oldest_activity
+ 'latest_activity_asc'
+ end
+
+ def sort_value_latest_activity
+ 'latest_activity_desc'
+ end
+
def sort_value_oldest_created
'created_asc'
end