Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

resolve issue with sort icons on admin/users and admin/runners (#24360)

Browse source 
Fixes #24327 to avoid the sort icon changing the table header over
multiple lines and adds missing sort icons on the runners page.
This commit is contained in:
jladbrook 2023-09-12 13:26:51 +01:00 committed by GitHub
parent e481638010
commit e33f112e01
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
models/actions/runner.go
View file

@ -189,6 +189,12 @@ func (opts FindRunnerOptions) toOrder() string {
return "last_online ASC" return "last_online ASC"
case "alphabetically": case "alphabetically":
return "name ASC" return "name ASC"
case "reversealphabetically":
return "name DESC"
case "newest":
return "id DESC"
case "oldest":
return "id ASC"
} }
return "last_online DESC" return "last_online DESC"
} }

1
routers/web/shared/actions/runners.go
View file

@ -53,6 +53,7 @@ func RunnersList(ctx *context.Context, opts actions_model.FindRunnerOptions) {
ctx.Data["RegistrationToken"] = token.Token ctx.Data["RegistrationToken"] = token.Token
ctx.Data["RunnerOwnerID"] = opts.OwnerID ctx.Data["RunnerOwnerID"] = opts.OwnerID
ctx.Data["RunnerRepoID"] = opts.RepoID ctx.Data["RunnerRepoID"] = opts.RepoID
ctx.Data["SortType"] = opts.Sort
pager := context.NewPagination(int(count), opts.PageSize, opts.Page, 5) pager := context.NewPagination(int(count), opts.PageSize, opts.Page, 5)

15
templates/shared/actions/runner_list.tmpl
View file

@ -45,9 +45,18 @@
<table class="ui very basic striped table unstackable"> <table class="ui very basic striped table unstackable">
<thead> <thead>
<tr> <tr>
<th data-sortt-asc="online" data-sortt-desc="offline">{{.locale.Tr "actions.runners.status"}}</th> <th data-sortt-asc="online" data-sortt-desc="offline">
<th data-sortt-asc="alphabetically">{{.locale.Tr "actions.runners.id"}}</th> {{.locale.Tr "actions.runners.status"}}
<th>{{.locale.Tr "actions.runners.name"}}</th> {{SortArrow "online" "offline" .SortType false}}
</th>
<th data-sortt-asc="newest" data-sortt-desc="oldest">
{{.locale.Tr "actions.runners.id"}}
{{SortArrow "oldest" "newest" .SortType false}}
</th>
<th data-sortt-asc="alphabetically" data-sortt-desc="reversealphabetically">
{{.locale.Tr "actions.runners.name"}}
{{SortArrow "alphabetically" "reversealphabetically" .SortType false}}
</th>
<th>{{.locale.Tr "actions.runners.version"}}</th> <th>{{.locale.Tr "actions.runners.version"}}</th>
<th>{{.locale.Tr "actions.runners.owner_type"}}</th> <th>{{.locale.Tr "actions.runners.owner_type"}}</th>
<th>{{.locale.Tr "actions.runners.labels"}}</th> <th>{{.locale.Tr "actions.runners.labels"}}</th>