Browse Source
Fix sorting admin user list by last login (#22081) (#22106)
Backport of #22081 Co-authored-by: KN4CK3R <admin@oldschoolhack.me>tags/v1.17.4
aceArt-GmbH
1 year ago
2 changed files with 6 additions and 2 deletions
+ 4
- 0
routers/web/explore/user.go
View File
| @@ -58,6 +58,10 @@ func RenderUserSearch(ctx *context.Context, opts *user_model.SearchUserOptions, | |||
| orderBy = "`user`.updated_unix ASC" | |||
| case "reversealphabetically": | |||
| orderBy = "`user`.name DESC" | |||
| case "lastlogin": | |||
| orderBy = "`user`.last_login_unix ASC" | |||
| case "reverselastlogin": | |||
| orderBy = "`user`.last_login_unix DESC" | |||
| case UserSearchDefaultSortType: // "alphabetically" | |||
| default: | |||
| orderBy = "`user`.name ASC" | |||
+ 2
- 2
templates/admin/user/list.tmpl
View File
| @@ -76,9 +76,9 @@ | |||
| <th>{{.i18n.Tr "admin.users.2fa"}}</th> | |||
| <th>{{.i18n.Tr "admin.users.repos"}}</th> | |||
| <th>{{.i18n.Tr "admin.users.created"}}</th> | |||
| <th data-sortt-asc="leastupdate" data-sortt-desc="recentupdate"> | |||
| <th data-sortt-asc="lastlogin" data-sortt-desc="reverselastlogin"> | |||
| {{.i18n.Tr "admin.users.last_login"}} | |||
| {{SortArrow "leastupdate" "recentupdate" $.SortType false}} | |||
| {{SortArrow "lastlogin" "reverselastlogin" $.SortType false}} | |||
| </th> | |||
| <th>{{.i18n.Tr "admin.users.edit"}}</th> | |||
| </tr> | |||
Loading…