Browse Source

Admins can now do unlimited page size user search (listAllUsers & listAllOrgs) (#6143)

Non-admins will default to 10 page size
tags/v1.9.0-dev
John Olheiser 5 years ago
parent
commit
994b1be9d1
2 changed files with 4 additions and 1 deletions
  1. 3
    0
      models/user.go
  2. 1
    1
      routers/api/v1/user/user.go

+ 3
- 0
models/user.go View File

if opts.PageSize > 0 { if opts.PageSize > 0 {
sess = sess.Limit(opts.PageSize, (opts.Page-1)*opts.PageSize) sess = sess.Limit(opts.PageSize, (opts.Page-1)*opts.PageSize)
} }
if opts.PageSize == -1 {
opts.PageSize = int(count)
}


users = make([]*User, 0, opts.PageSize) users = make([]*User, 0, opts.PageSize)
return users, count, sess.OrderBy(opts.OrderBy.String()).Find(&users) return users, count, sess.OrderBy(opts.OrderBy.String()).Find(&users)

+ 1
- 1
routers/api/v1/user/user.go View File

Type: models.UserTypeIndividual, Type: models.UserTypeIndividual,
PageSize: com.StrTo(ctx.Query("limit")).MustInt(), PageSize: com.StrTo(ctx.Query("limit")).MustInt(),
} }
if opts.PageSize == 0 {
if opts.PageSize <= 0 {
opts.PageSize = 10 opts.PageSize = 10
} }



Loading…
Cancel
Save