Skip to content

Commit 994b1be

Browse files
jolheisertechknowlogick
authored andcommitted
Admins can now do unlimited page size user search (listAllUsers & listAllOrgs) (#6143)
Non-admins will default to 10 page size
1 parent 477ef46 commit 994b1be

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

models/user.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1433,6 +1433,9 @@ func SearchUsers(opts *SearchUserOptions) (users []*User, _ int64, _ error) {
14331433
if opts.PageSize > 0 {
14341434
sess = sess.Limit(opts.PageSize, (opts.Page-1)*opts.PageSize)
14351435
}
1436+
if opts.PageSize == -1 {
1437+
opts.PageSize = int(count)
1438+
}
14361439

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

routers/api/v1/user/user.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func Search(ctx *context.APIContext) {
5555
Type: models.UserTypeIndividual,
5656
PageSize: com.StrTo(ctx.Query("limit")).MustInt(),
5757
}
58-
if opts.PageSize == 0 {
58+
if opts.PageSize <= 0 {
5959
opts.PageSize = 10
6060
}
6161

0 commit comments

Comments
 (0)