diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-24 12:12:27 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-24 12:12:27 -0700 |
| commit | 8ad9a88bda0b6dc3f24945efdbe8b3aa4dcc4360 (patch) | |
| tree | b961f87c1bd9a2428eaee8b5ebd8c9fd1baf0fcc /web/web.go | |
| parent | a374419ad5c5f35174ee6285b4eaa57ef82235bd (diff) | |
| parent | caa157a3774ee86f0e7003ef4debc49bd88cb9f0 (diff) | |
| download | chat-8ad9a88bda0b6dc3f24945efdbe8b3aa4dcc4360.tar.gz chat-8ad9a88bda0b6dc3f24945efdbe8b3aa4dcc4360.tar.bz2 chat-8ad9a88bda0b6dc3f24945efdbe8b3aa4dcc4360.zip | |
Fixing merge
Diffstat (limited to 'web/web.go')
| -rw-r--r-- | web/web.go | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/web/web.go b/web/web.go index 3b36f3d56..1e435d47f 100644 --- a/web/web.go +++ b/web/web.go @@ -145,14 +145,8 @@ func root(c *api.Context, w http.ResponseWriter, r *http.Request) { return } - 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) - } + page := NewHtmlTemplatePage("signup_team", "Signup") + page.Render(c, w) } func signup(c *api.Context, w http.ResponseWriter, r *http.Request) { @@ -175,8 +169,7 @@ func login(c *api.Context, w http.ResponseWriter, r *http.Request) { var team *model.Team if tResult := <-api.Srv.Store.Team().GetByName(teamName); tResult.Err != nil { l4g.Error("Couldn't find team name=%v, teamURL=%v, err=%v", teamName, c.GetTeamURL(), tResult.Err.Message) - // This should probably do somthing nicer - http.Redirect(w, r, "http://"+r.Host, http.StatusTemporaryRedirect) + http.Redirect(w, r, api.GetProtocol(r)+"://"+r.Host, http.StatusTemporaryRedirect) return } else { team = tResult.Data.(*model.Team) |