diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-03-29 21:11:40 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-03-29 21:11:40 -0400 |
commit | 6ac87d82e38c83e3b9b3bd12c3122e047f0110b1 (patch) | |
tree | aa3f0f8f41df7c987f8bb62756ca3d8259ecbaa1 /app | |
parent | a4764a5c10ec59820eec7338d97be48d41c1a4d6 (diff) | |
download | chat-6ac87d82e38c83e3b9b3bd12c3122e047f0110b1.tar.gz chat-6ac87d82e38c83e3b9b3bd12c3122e047f0110b1.tar.bz2 chat-6ac87d82e38c83e3b9b3bd12c3122e047f0110b1.zip |
PLT-2713 Added ability for admins to list users not in any team (#5844)
* PLT-2713 Added ability for admins to list users not in any team
* Updated style of unit test
Diffstat (limited to 'app')
-rw-r--r-- | app/user.go | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/app/user.go b/app/user.go index 1c2aca34f..8e0615508 100644 --- a/app/user.go +++ b/app/user.go @@ -579,6 +579,27 @@ func GetUsersNotInChannelPage(teamId string, channelId string, page int, perPage return users, nil } +func GetUsersWithoutTeamPage(page int, perPage int, asAdmin bool) ([]*model.User, *model.AppError) { + users, err := GetUsersWithoutTeam(page*perPage, perPage) + if err != nil { + return nil, err + } + + for _, user := range users { + SanitizeProfile(user, asAdmin) + } + + return users, nil +} + +func GetUsersWithoutTeam(offset int, limit int) ([]*model.User, *model.AppError) { + if result := <-Srv.Store.User().GetProfilesWithoutTeam(offset, limit); result.Err != nil { + return nil, result.Err + } else { + return result.Data.([]*model.User), nil + } +} + func GetUsersByIds(userIds []string, asAdmin bool) ([]*model.User, *model.AppError) { if result := <-Srv.Store.User().GetProfileByIds(userIds, true); result.Err != nil { return nil, result.Err |