From 36e96e34815019103bb5905fece3fbf566fb0737 Mon Sep 17 00:00:00 2001 From: "Otto Richter (fnetX)" Date: Wed, 2 Mar 2022 00:00:03 +0100 Subject: [PATCH] Fix admin user list pagination (#18957) (#18960) --- modules/context/pagination.go | 9 +++++++++ routers/web/explore/user.go | 1 + 2 files changed, 10 insertions(+) diff --git a/modules/context/pagination.go b/modules/context/pagination.go index 107cbf618637..140b67678687 100644 --- a/modules/context/pagination.go +++ b/modules/context/pagination.go @@ -55,3 +55,12 @@ func (p *Pagination) SetDefaultParams(ctx *Context) { p.AddParam(ctx, "tab", "TabName") p.AddParam(ctx, "t", "queryType") } + +// SetUserFilterParams sets common pagination params for user filtering, e.g. the admin userlist +func (p *Pagination) SetUserFilterParams(ctx *Context) { + p.AddParamString("status_filter[is_active]", ctx.FormString("status_filter[is_active]")) + p.AddParamString("status_filter[is_admin]", ctx.FormString("status_filter[is_admin]")) + p.AddParamString("status_filter[is_restricted]", ctx.FormString("status_filter[is_restricted]")) + p.AddParamString("status_filter[is_2fa_enabled]", ctx.FormString("status_filter[is_2fa_enabled]")) + p.AddParamString("status_filter[is_prohibit_login]", ctx.FormString("status_filter[is_prohibit_login]")) +} diff --git a/routers/web/explore/user.go b/routers/web/explore/user.go index 27634c3d4ef9..1836df17b0d1 100644 --- a/routers/web/explore/user.go +++ b/routers/web/explore/user.go @@ -84,6 +84,7 @@ func RenderUserSearch(ctx *context.Context, opts *user_model.SearchUserOptions, pager := context.NewPagination(int(count), opts.PageSize, opts.Page, 5) pager.SetDefaultParams(ctx) + pager.SetUserFilterParams(ctx) ctx.Data["Page"] = pager ctx.HTML(http.StatusOK, tplName)