Merge pull request #810 from mattermost/fixing-redirect3

Fixing 1 more case

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})

web/web.go

@@ -145,8 +145,14 @@ func root(c *api.Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	page := NewHtmlTemplatePage("signup_team", "Signup")
+	if len(c.Session.UserId) == 0 {
-	page.Render(c, w)
+		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) {