From 54b52de6eed4eb2f76620c48189ba3167c290121 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Wed, 19 Aug 2015 05:47:45 +0800 Subject: minor fix on API response --- routers/api/v1/user.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'routers/api/v1') diff --git a/routers/api/v1/user.go b/routers/api/v1/user.go index feecda48..60b6adcd 100644 --- a/routers/api/v1/user.go +++ b/routers/api/v1/user.go @@ -18,7 +18,7 @@ import ( // ToApiUser converts user to API format. func ToApiUser(u *models.User) *api.User { return &api.User{ - Id: u.Id, + ID: u.Id, UserName: u.Name, AvatarUrl: string(setting.Protocol) + u.AvatarLink(), } @@ -45,10 +45,14 @@ func SearchUsers(ctx *middleware.Context) { results := make([]*api.User, len(us)) for i := range us { results[i] = &api.User{ + ID: us[i].Id, UserName: us[i].Name, AvatarUrl: us[i].AvatarLink(), FullName: us[i].FullName, } + if ctx.IsSigned { + results[i].Email = us[i].Email + } } ctx.Render.JSON(200, map[string]interface{}{ -- cgit v1.2.3