From e30e4cfe3d787e2528419b0d17973eb0fc162d56 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Tue, 5 Sep 2017 17:40:35 -0400 Subject: PLT-7468 Moved more error pages to use predefined error types (#7378) * PLT-7468 Moved more errors to use error types * PLT-7468 Moved 404 error page to use error types * Made helper function for rendering external links on error page --- api4/oauth.go | 4 +--- api4/user.go | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'api4') diff --git a/api4/oauth.go b/api4/oauth.go index c3586bbdf..ae5035fdc 100644 --- a/api4/oauth.go +++ b/api4/oauth.go @@ -392,9 +392,7 @@ func completeOAuth(c *Context, w http.ResponseWriter, r *http.Request) { code := r.URL.Query().Get("code") if len(code) == 0 { - err := model.NewAppError("completeOAuth", "api.oauth.complete_oauth.missing_code.app_error", map[string]interface{}{"service": strings.Title(service)}, "URL: "+r.URL.String(), http.StatusBadRequest) - err.Translate(c.T) - http.Redirect(w, r, c.GetSiteURLHeader()+"/error?message="+err.Message, http.StatusTemporaryRedirect) + http.Redirect(w, r, c.GetSiteURLHeader()+"/error?type=oauth_missing_code&service="+strings.Title(service), http.StatusTemporaryRedirect) return } diff --git a/api4/user.go b/api4/user.go index 889fe56a3..805ec4241 100644 --- a/api4/user.go +++ b/api4/user.go @@ -244,7 +244,7 @@ func setProfileImage(c *Context, w http.ResponseWriter, r *http.Request) { } if err := r.ParseMultipartForm(*utils.Cfg.FileSettings.MaxFileSize); err != nil { - c.Err = model.NewAppError("uploadProfileImage", "api.user.upload_profile_user.parse.app_error", nil, "", http.StatusInternalServerError) + c.Err = model.NewAppError("uploadProfileImage", "api.user.upload_profile_user.parse.app_error", nil, err.Error(), http.StatusInternalServerError) return } -- cgit v1.2.3-1-g7c22