opensource/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-09-24 16:05:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix copy/paste error for getting users (#5373)

Browse Source
This commit is contained in:
Joram Wilander
2017-02-12 15:17:34 -05:00
committed by GitHub
parent eab15da321
commit d05525e216
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/user.go
+4 -4
View File
@@ -321,7 +321,7 @@ func GetUser(userId string) (*model.User, *model.AppError) {
}
func GetUserByUsername(username string) (*model.User, *model.AppError) {
if result := <-Srv.Store.User().GetByUsername(username); result.Err != nil && result.Err.Id == "store.sql_user.get_by_username.app_error" {
if result := <-Srv.Store.User().GetByUsername(username); result.Err != nil && result.Err.Id == "store.sql_user.get_by_username.app_error" {
result.Err.StatusCode = http.StatusNotFound
return nil, result.Err
} else {
@@ -331,7 +331,7 @@ func GetUserByUsername(username string) (*model.User, *model.AppError) {
func GetUserByEmail(email string) (*model.User, *model.AppError) {
if result := <-Srv.Store.User().GetByEmail(email); result.Err != nil && result.Err.Id == "store.sql_user.missing_account.const"{
if result := <-Srv.Store.User().GetByEmail(email); result.Err != nil && result.Err.Id == "store.sql_user.missing_account.const" {
result.Err.StatusCode = http.StatusNotFound
return nil, result.Err
} else if result.Err != nil {
@@ -389,8 +389,8 @@ func GetUsers(offset int, limit int) ([]*model.User, *model.AppError) {
}
}
func GetUsersMap(page int, perPage int, asAdmin bool) (map[string]*model.User, *model.AppError) {
users, err := GetUsers(page*perPage, perPage)
func GetUsersMap(offset int, limit int, asAdmin bool) (map[string]*model.User, *model.AppError) {
users, err := GetUsers(offset, limit)
if err != nil {
return nil, err
}