summaryrefslogtreecommitdiff
path: root/app/finders/admin/runners_finder.rb
diff options
context:
space:
mode:
authorAlexis Reigel <alexis.reigel.ext@siemens.com>2018-07-12 18:15:03 +0200
committerAlexis Reigel <alexis.reigel.ext@siemens.com>2018-08-29 15:02:54 +0200
commit34bdb74740d0b983bfc299362b25945c9e50681c (patch)
tree290ee4a1d7d5938849acf916149ab909a51f1cfc /app/finders/admin/runners_finder.rb
parent89b30999c294d2e344d095e635d72aa16d108a2b (diff)
downloadgitlab-ce-34bdb74740d0b983bfc299362b25945c9e50681c.tar.gz
add sort dropdown to admin runners page
Diffstat (limited to 'app/finders/admin/runners_finder.rb')
-rw-r--r--app/finders/admin/runners_finder.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/app/finders/admin/runners_finder.rb b/app/finders/admin/runners_finder.rb
index 19e1dc5e477..09329accf41 100644
--- a/app/finders/admin/runners_finder.rb
+++ b/app/finders/admin/runners_finder.rb
@@ -14,6 +14,14 @@ class Admin::RunnersFinder < UnionFinder
@runners
end
+ def sort_key
+ if @params[:sort] == 'contacted_asc'
+ 'contacted_asc'
+ else
+ 'created_date'
+ end
+ end
+
private
def search!
@@ -33,7 +41,7 @@ class Admin::RunnersFinder < UnionFinder
end
def sort!
- sort = @params[:sort] == 'contacted_asc' ? { contacted_at: :asc } : { id: :desc }
+ sort = sort_key == 'contacted_asc' ? { contacted_at: :asc } : { created_at: :desc }
@runners = @runners.order(sort)
end