Fix wrong paging on org members (#9990)

tokarchuk/v1.17
Lunny Xiao 5 years ago committed by GitHub
parent 59510d6227
commit 8d51f28ba0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      models/list_options.go
  2. 2
      routers/org/members.go

@ -13,7 +13,7 @@ import (
// ListOptions options to paginate results // ListOptions options to paginate results
type ListOptions struct { type ListOptions struct {
PageSize int PageSize int
Page int Page int // start from 1
} }
func (opts ListOptions) getPaginatedSession() *xorm.Session { func (opts ListOptions) getPaginatedSession() *xorm.Session {

@ -52,7 +52,7 @@ func Members(ctx *context.Context) {
} }
pager := context.NewPagination(int(total), setting.UI.MembersPagingNum, page, 5) pager := context.NewPagination(int(total), setting.UI.MembersPagingNum, page, 5)
opts.ListOptions.Page = (page - 1) * setting.UI.MembersPagingNum opts.ListOptions.Page = page
opts.ListOptions.PageSize = setting.UI.MembersPagingNum opts.ListOptions.PageSize = setting.UI.MembersPagingNum
members, membersIsPublic, err := models.FindOrgMembers(&opts) members, membersIsPublic, err := models.FindOrgMembers(&opts)
if err != nil { if err != nil {

Loading…
Cancel
Save