Commit 22ade6e7 authored by Rémy Coutable's avatar Rémy Coutable 🔴

Merge branch '38720-sort-admin-runners' into 'master'

Add sort runners on admin runners

Closes #38720

See merge request gitlab-org/gitlab-ce!14661
parents 1faa97b2 6aff4984
......@@ -2,7 +2,8 @@ class Admin::RunnersController < Admin::ApplicationController
before_action :runner, except: :index
def index
@runners = Ci::Runner.order('id DESC')
sort = params[:sort] == 'contacted_asc' ? { contacted_at: :asc } : { id: :desc }
@runners = Ci::Runner.order(sort)
@runners = @runners.search(params[:search]) if params[:search].present?
@runners = @runners.page(params[:page]).per(30)
@active_runners_cnt = Ci::Runner.online.count
......
......@@ -63,7 +63,7 @@
%th Projects
%th Jobs
%th Tags
%th Last contact
%th= link_to 'Last contact', admin_runners_path(params.slice(:search).merge(sort: 'contacted_asc'))
%th
- @runners.each do |runner|
......
---
title: Add sort runners on admin runners
merge_request: 14661
author: Takuya Noguchi
type: added
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment