Return a UserList from /api/v1/admin/users (#6629) (#6642)

This commit is contained in:
zeripath authored and techknowlogick committed 2019-04-15 17:38:41 -04:00
1 parent c363ef5da0
commit b9c5a3acc3
4 files changed
+50 -13

No files matched your search

+16
View File
@@ -14,6 +14,7 @@ import (
"code.gitea.io/git"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/markup"
"code.gitea.io/gitea/modules/util"
)
@@ -217,3 +218,18 @@ func ToTeam(team *models.Team) *api.Team {
Units: team.GetUnitNames(),
}
}
// ToUser convert models.User to api.User
func ToUser(user *models.User, signed, admin bool) *api.User {
result := &api.User{
ID: user.ID,
UserName: user.Name,
AvatarURL: user.AvatarLink(),
FullName: markup.Sanitize(user.FullName),
IsAdmin: user.IsAdmin,
}
if signed && (!user.KeepEmailPrivate || admin) {
result.Email = user.Email
}
return result
}