From 08a343c37288635ba836db41ffd8529209a88fa5 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Fri, 25 Sep 2015 09:51:27 -0700
Subject: Fixing 1 more case

---
 api/context.go |  8 +++++++-
 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) {
-- 
cgit v1.2.3-1-g7c22