diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2023-09-14 14:53:36 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-14 06:53:36 +0000 |
| commit | 198a9ca6350954a6d3327a408021fec2bc0fc805 (patch) | |
| tree | de73b2232ca2474ce9126f52d26298f8eaef3dfd /routers/web/admin | |
| parent | a457eb94151a718be64d12eff9d9b7eafd6511ad (diff) | |
| download | gitea-198a9ca6350954a6d3327a408021fec2bc0fc805.tar.gz gitea-198a9ca6350954a6d3327a408021fec2bc0fc805.zip | |
Display all user types and org types on admin management UI (#27050)
Follow #24026
<img width="1049" alt="图片"
src="https://github.com/go-gitea/gitea/assets/81045/d3fc5159-b5e7-411a-b6f8-4a111a027e6b">
---------
Co-authored-by: delvh <dev.lh@web.de>
Diffstat (limited to 'routers/web/admin')
| -rw-r--r-- | routers/web/admin/orgs.go | 5 | ||||
| -rw-r--r-- | routers/web/admin/users.go | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/routers/web/admin/orgs.go b/routers/web/admin/orgs.go index d0fd0d5002..ab44f8048b 100644 --- a/routers/web/admin/orgs.go +++ b/routers/web/admin/orgs.go @@ -28,8 +28,9 @@ func Organizations(ctx *context.Context) { } explore.RenderUserSearch(ctx, &user_model.SearchUserOptions{ - Actor: ctx.Doer, - Type: user_model.UserTypeOrganization, + Actor: ctx.Doer, + Type: user_model.UserTypeOrganization, + IncludeReserved: true, // administrator needs to list all acounts include reserved ListOptions: db.ListOptions{ PageSize: setting.UI.Admin.OrgPagingNum, }, diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go index 47dff6e852..03ffaf5f3f 100644 --- a/routers/web/admin/users.go +++ b/routers/web/admin/users.go @@ -77,6 +77,7 @@ func Users(ctx *context.Context) { IsRestricted: util.OptionalBoolParse(statusFilterMap["is_restricted"]), IsTwoFactorEnabled: util.OptionalBoolParse(statusFilterMap["is_2fa_enabled"]), IsProhibitLogin: util.OptionalBoolParse(statusFilterMap["is_prohibit_login"]), + IncludeReserved: true, // administrator needs to list all acounts include reserved, bot, remote ones ExtraParamStrings: extraParamStrings, }, tplUsers) } |