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
Этот коммит содержится в:
коммит произвёл
Joram Wilander
родитель
6ca443a255
Коммит
e30e4cfe3d
12
utils/api.go
12
utils/api.go
@@ -35,13 +35,8 @@ func GetOriginChecker(r *http.Request) OriginCheckerProc {
|
||||
}
|
||||
|
||||
func RenderWebError(err *model.AppError, w http.ResponseWriter, r *http.Request) {
|
||||
T, _ := GetTranslationsAndLocale(w, r)
|
||||
|
||||
title := T("api.templates.error.title", map[string]interface{}{"SiteName": ClientCfg["SiteName"]})
|
||||
message := err.Message
|
||||
details := err.DetailedError
|
||||
link := "/"
|
||||
linkMessage := T("api.templates.error.link")
|
||||
|
||||
status := http.StatusTemporaryRedirect
|
||||
if err.StatusCode != http.StatusInternalServerError {
|
||||
@@ -51,10 +46,7 @@ func RenderWebError(err *model.AppError, w http.ResponseWriter, r *http.Request)
|
||||
http.Redirect(
|
||||
w,
|
||||
r,
|
||||
"/error?title="+url.QueryEscape(title)+
|
||||
"&message="+url.QueryEscape(message)+
|
||||
"&details="+url.QueryEscape(details)+
|
||||
"&link="+url.QueryEscape(link)+
|
||||
"&linkmessage="+url.QueryEscape(linkMessage),
|
||||
"/error?message="+url.QueryEscape(message)+
|
||||
"&details="+url.QueryEscape(details),
|
||||
status)
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user