finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixes #6881 - API users search fix (#6882)

Browse source
This commit is contained in:
Richard Mahn 2019-05-08 15:17:32 -04:00 • committed by Lauris BH
parent d8b2ed6627
commit 6db3dc7c02
4 changed files with 69 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
routers/api/v1/admin/user.go
View file

@ -326,7 +326,7 @@ func GetAllUsers(ctx *context.APIContext) {
results := make([]*api.User, len(users))
for i := range users {
results[i] = convert.ToUser(users[i], ctx.IsSigned, ctx.User.IsAdmin)
results[i] = convert.ToUser(users[i], ctx.IsSigned, ctx.User != nil && ctx.User.IsAdmin)
}
ctx.JSON(200, &results)

2
routers/api/v1/user/user.go
View file

@ -67,7 +67,7 @@ func Search(ctx *context.APIContext) {
results := make([]*api.User, len(users))
for i := range users {
results[i] = convert.ToUser(users[i], ctx.IsSigned, ctx.User.IsAdmin)
results[i] = convert.ToUser(users[i], ctx.IsSigned, ctx.User != nil && ctx.User.IsAdmin)
}
ctx.JSON(200, map[string]interface{}{