Skip to content

Commit aee0fa6

Browse files
authored
Fix admin user list pagination (#18957)
1 parent 062fd4c commit aee0fa6

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

modules/context/pagination.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,12 @@ func (p *Pagination) SetDefaultParams(ctx *Context) {
5555
p.AddParam(ctx, "tab", "TabName")
5656
p.AddParam(ctx, "t", "queryType")
5757
}
58+
59+
// SetUserFilterParams sets common pagination params for user filtering, e.g. the admin userlist
60+
func (p *Pagination) SetUserFilterParams(ctx *Context) {
61+
p.AddParamString("status_filter[is_active]", ctx.FormString("status_filter[is_active]"))
62+
p.AddParamString("status_filter[is_admin]", ctx.FormString("status_filter[is_admin]"))
63+
p.AddParamString("status_filter[is_restricted]", ctx.FormString("status_filter[is_restricted]"))
64+
p.AddParamString("status_filter[is_2fa_enabled]", ctx.FormString("status_filter[is_2fa_enabled]"))
65+
p.AddParamString("status_filter[is_prohibit_login]", ctx.FormString("status_filter[is_prohibit_login]"))
66+
}

routers/web/explore/user.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ func RenderUserSearch(ctx *context.Context, opts *user_model.SearchUserOptions,
8282

8383
pager := context.NewPagination(int(count), opts.PageSize, opts.Page, 5)
8484
pager.SetDefaultParams(ctx)
85+
pager.SetUserFilterParams(ctx)
8586
ctx.Data["Page"] = pager
8687

8788
ctx.HTML(http.StatusOK, tplName)

0 commit comments

Comments
 (0)