diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-09-25 13:12:40 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-09-25 13:12:40 -0400 |
| commit | 73cdee70d7bcba367ff006ce1ce6a6d50ccbf3e7 (patch) | |
| tree | a8c1df91f950df5c09506e5934e57b56d288234f | |
| parent | 3d2f29f5613d848486fe6fc6219a2b0f2647095f (diff) | |
| parent | 08a343c37288635ba836db41ffd8529209a88fa5 (diff) | |
| download | chat-73cdee70d7bcba367ff006ce1ce6a6d50ccbf3e7.tar.gz chat-73cdee70d7bcba367ff006ce1ce6a6d50ccbf3e7.tar.bz2 chat-73cdee70d7bcba367ff006ce1ce6a6d50ccbf3e7.zip | |
Merge pull request #810 from mattermost/fixing-redirect3
Fixing 1 more case
| -rw-r--r-- | api/context.go | 8 | ||||
| -rw-r--r-- | web/web.go | 10 |
2 files changed, 15 insertions, 3 deletions
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}) diff --git a/web/web.go b/web/web.go index 1e435d47f..da7eff13d 100644 --- a/web/web.go +++ b/web/web.go @@ -145,8 +145,14 @@ func root(c *api.Context, w http.ResponseWriter, r *http.Request) { return } - page := NewHtmlTemplatePage("signup_team", "Signup") - page.Render(c, w) + if len(c.Session.UserId) == 0 { + page := NewHtmlTemplatePage("signup_team", "Signup") + page.Render(c, w) + } else { + page := NewHtmlTemplatePage("home", "Home") + page.Props["TeamURL"] = c.GetTeamURL() + page.Render(c, w) + } } func signup(c *api.Context, w http.ResponseWriter, r *http.Request) { |