From e6e2c2f4a481b06dbb66ef13f275dd26808656a5 Mon Sep 17 00:00:00 2001 From: John Olheiser Date: Wed, 18 Jan 2023 11:47:23 -0600 Subject: [PATCH] Reliable selection of admin user (#22509) (#22511) Backport #22509 Co-authored-by: Sybren <122987084+drsybren@users.noreply.github.com> --- models/user/user.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/models/user/user.go b/models/user/user.go index 9a2da6dbc..63d9b8ad6 100644 --- a/models/user/user.go +++ b/models/user/user.go @@ -1227,7 +1227,10 @@ func GetUserByOpenID(uri string) (*User, error) { // GetAdminUser returns the first administrator func GetAdminUser() (*User, error) { var admin User - has, err := db.GetEngine(db.DefaultContext).Where("is_admin=?", true).Get(&admin) + has, err := db.GetEngine(db.DefaultContext). + Where("is_admin=?", true). + Asc("id"). // Reliably get the admin with the lowest ID. + Get(&admin) if err != nil { return nil, err } else if !has {