From 3bb2e67203c70e494b40b8bea532730bea336d4c Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Thu, 24 Sep 2015 12:04:45 -0400 Subject: Fixing 404 page props --- api/context.go | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'api/context.go') diff --git a/api/context.go b/api/context.go index 9a276a1a1..f123d8702 100644 --- a/api/context.go +++ b/api/context.go @@ -456,18 +456,13 @@ func IsPrivateIpAddress(ipAddress string) bool { } func RenderWebError(err *model.AppError, w http.ResponseWriter, r *http.Request) { - - protocol := GetProtocol(r) - SiteURL := protocol + "://" + r.Host - - m := make(map[string]string) - m["Message"] = err.Message - m["Details"] = err.DetailedError - m["SiteName"] = utils.Cfg.TeamSettings.SiteName - m["SiteURL"] = SiteURL + props := make(map[string]string) + props["Message"] = err.Message + props["Details"] = err.DetailedError + props["SiteURL"] = GetProtocol(r) + "://" + r.Host w.WriteHeader(err.StatusCode) - ServerTemplates.ExecuteTemplate(w, "error.html", m) + ServerTemplates.ExecuteTemplate(w, "error.html", Page{Props: props, ClientProps: utils.ClientProperties}) } func Handle404(w http.ResponseWriter, r *http.Request) { -- cgit v1.2.3-1-g7c22 From 08a343c37288635ba836db41ffd8529209a88fa5 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Fri, 25 Sep 2015 09:51:27 -0700 Subject: Fixing 1 more case --- api/context.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'api/context.go') diff --git a/api/context.go b/api/context.go index f123d8702..d90fbd9ee 100644 --- a/api/context.go +++ b/api/context.go @@ -459,7 +459,13 @@ func RenderWebError(err *model.AppError, w http.ResponseWriter, r *http.Request) props := make(map[string]string) props["Message"] = err.Message props["Details"] = err.DetailedError - props["SiteURL"] = GetProtocol(r) + "://" + r.Host + + pathParts := strings.Split(r.URL.Path, "/") + if len(pathParts) > 1 { + props["SiteURL"] = GetProtocol(r) + "://" + r.Host + "/" + pathParts[1] + } else { + props["SiteURL"] = GetProtocol(r) + "://" + r.Host + } w.WriteHeader(err.StatusCode) ServerTemplates.ExecuteTemplate(w, "error.html", Page{Props: props, ClientProps: utils.ClientProperties}) -- cgit v1.2.3-1-g7c22