From e33f112e01d2453f8674c05556944277bf38567b Mon Sep 17 00:00:00 2001 From: jladbrook Date: Tue, 12 Sep 2023 13:26:51 +0100 Subject: [PATCH] resolve issue with sort icons on admin/users and admin/runners (#24360) Fixes #24327 to avoid the sort icon changing the table header over multiple lines and adds missing sort icons on the runners page. --- models/actions/runner.go | 6 ++++++ routers/web/shared/actions/runners.go | 1 + templates/shared/actions/runner_list.tmpl | 15 ++++++++++++--- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/models/actions/runner.go b/models/actions/runner.go index c79a6827f..ec6b49cf1 100644 --- a/models/actions/runner.go +++ b/models/actions/runner.go @@ -189,6 +189,12 @@ func (opts FindRunnerOptions) toOrder() string { return "last_online ASC" case "alphabetically": return "name ASC" + case "reversealphabetically": + return "name DESC" + case "newest": + return "id DESC" + case "oldest": + return "id ASC" } return "last_online DESC" } diff --git a/routers/web/shared/actions/runners.go b/routers/web/shared/actions/runners.go index cab3d78ca..7ff1f3e33 100644 --- a/routers/web/shared/actions/runners.go +++ b/routers/web/shared/actions/runners.go @@ -53,6 +53,7 @@ func RunnersList(ctx *context.Context, opts actions_model.FindRunnerOptions) { ctx.Data["RegistrationToken"] = token.Token ctx.Data["RunnerOwnerID"] = opts.OwnerID ctx.Data["RunnerRepoID"] = opts.RepoID + ctx.Data["SortType"] = opts.Sort pager := context.NewPagination(int(count), opts.PageSize, opts.Page, 5) diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl index c4b70282a..ead260f12 100644 --- a/templates/shared/actions/runner_list.tmpl +++ b/templates/shared/actions/runner_list.tmpl @@ -45,9 +45,18 @@ - - - + + +
{{.locale.Tr "actions.runners.status"}}{{.locale.Tr "actions.runners.id"}}{{.locale.Tr "actions.runners.name"}} + {{.locale.Tr "actions.runners.status"}} + {{SortArrow "online" "offline" .SortType false}} + + {{.locale.Tr "actions.runners.id"}} + {{SortArrow "oldest" "newest" .SortType false}} + + {{.locale.Tr "actions.runners.name"}} + {{SortArrow "alphabetically" "reversealphabetically" .SortType false}} + {{.locale.Tr "actions.runners.version"}} {{.locale.Tr "actions.runners.owner_type"}} {{.locale.Tr "actions.runners.labels"}}