diff options
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/components/signup_team.jsx | 6 | ||||
| -rw-r--r-- | web/web.go | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/web/react/components/signup_team.jsx b/web/react/components/signup_team.jsx index 814ec2fc1..f926f5cbb 100644 --- a/web/react/components/signup_team.jsx +++ b/web/react/components/signup_team.jsx @@ -36,12 +36,6 @@ export default class TeamSignUp extends React.Component { } } - componentDidMount() { - if (global.window.mm_config.EnableTeamListing === 'true' && this.props.teams.length === 1) { - window.location.href = '/' + this.props.teams[0].name; - } - } - updatePage(page) { this.setState({page}); } diff --git a/web/web.go b/web/web.go index 3cfda39e7..424adea93 100644 --- a/web/web.go +++ b/web/web.go @@ -166,11 +166,14 @@ func root(c *api.Context, w http.ResponseWriter, r *http.Request) { return } else { teams := result.Data.([]*model.Team) - l4g.Info(teams) - for _, team := range teams { page.Props[team.Name] = team.DisplayName } + + if len(teams) == 1 && *utils.Cfg.TeamSettings.EnableTeamListing { + http.Redirect(w, r, c.GetSiteURL()+"/"+teams[0].Name, http.StatusTemporaryRedirect) + return + } } page.Render(c, w) |