diff options
| author | George Goldberg <george@gberg.me> | 2017-08-31 15:03:16 +0100 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-08-31 10:03:16 -0400 |
| commit | 63b10be020deffecba0c5eef8e5872418215b464 (patch) | |
| tree | 192c061ba8abc8c07b4241fa1d186c0152f8267a /api4/team.go | |
| parent | b37e17c03259b592e0bc735d48d15d7cf34469e4 (diff) | |
| download | chat-63b10be020deffecba0c5eef8e5872418215b464.tar.gz chat-63b10be020deffecba0c5eef8e5872418215b464.tar.bz2 chat-63b10be020deffecba0c5eef8e5872418215b464.zip | |
APIv4: NewLocAppError -> NewAppError (#7328)
Diffstat (limited to 'api4/team.go')
| -rw-r--r-- | api4/team.go | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/api4/team.go b/api4/team.go index b71b285e6..656c4dbbc 100644 --- a/api4/team.go +++ b/api4/team.go @@ -603,7 +603,7 @@ func importTeam(c *Context, w http.ResponseWriter, r *http.Request) { } if err := r.ParseMultipartForm(10000000); err != nil { - c.Err = model.NewLocAppError("importTeam", "api.team.import_team.parse.app_error", nil, err.Error()) + c.Err = model.NewAppError("importTeam", "api.team.import_team.parse.app_error", nil, err.Error(), http.StatusInternalServerError) return } @@ -612,28 +612,24 @@ func importTeam(c *Context, w http.ResponseWriter, r *http.Request) { fileSizeStr, ok := r.MultipartForm.Value["filesize"] if !ok { - c.Err = model.NewLocAppError("importTeam", "api.team.import_team.unavailable.app_error", nil, "") - c.Err.StatusCode = http.StatusBadRequest + c.Err = model.NewAppError("importTeam", "api.team.import_team.unavailable.app_error", nil, "", http.StatusBadRequest) return } fileSize, err := strconv.ParseInt(fileSizeStr[0], 10, 64) if err != nil { - c.Err = model.NewLocAppError("importTeam", "api.team.import_team.integer.app_error", nil, "") - c.Err.StatusCode = http.StatusBadRequest + c.Err = model.NewAppError("importTeam", "api.team.import_team.integer.app_error", nil, "", http.StatusBadRequest) return } fileInfoArray, ok := r.MultipartForm.File["file"] if !ok { - c.Err = model.NewLocAppError("importTeam", "api.team.import_team.no_file.app_error", nil, "") - c.Err.StatusCode = http.StatusBadRequest + c.Err = model.NewAppError("importTeam", "api.team.import_team.no_file.app_error", nil, "", http.StatusBadRequest) return } if len(fileInfoArray) <= 0 { - c.Err = model.NewLocAppError("importTeam", "api.team.import_team.array.app_error", nil, "") - c.Err.StatusCode = http.StatusBadRequest + c.Err = model.NewAppError("importTeam", "api.team.import_team.array.app_error", nil, "", http.StatusBadRequest) return } @@ -642,8 +638,7 @@ func importTeam(c *Context, w http.ResponseWriter, r *http.Request) { fileData, err := fileInfo.Open() defer fileData.Close() if err != nil { - c.Err = model.NewLocAppError("importTeam", "api.team.import_team.open.app_error", nil, err.Error()) - c.Err.StatusCode = http.StatusBadRequest + c.Err = model.NewAppError("importTeam", "api.team.import_team.open.app_error", nil, err.Error(), http.StatusBadRequest) return } |