diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-03-24 12:45:12 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-03-24 12:45:12 -0400 |
| commit | c64b12e27a4218f27bfdfd935fd64ea43f0e6e26 (patch) | |
| tree | 625baa2a878d1ad9992085649a998fd5f9088094 /webapp/components/signup_team_complete | |
| parent | 998ce12133358eab587702e258edefbd437f86ba (diff) | |
| parent | d6a6668a39db2f78d59919686c5d7b901888da36 (diff) | |
| download | chat-c64b12e27a4218f27bfdfd935fd64ea43f0e6e26.tar.gz chat-c64b12e27a4218f27bfdfd935fd64ea43f0e6e26.tar.bz2 chat-c64b12e27a4218f27bfdfd935fd64ea43f0e6e26.zip | |
Merge pull request #2529 from mattermost/plt-2383
PLT-2383 Fixed system console login page flash.
Diffstat (limited to 'webapp/components/signup_team_complete')
| -rw-r--r-- | webapp/components/signup_team_complete/components/signup_team_complete.jsx | 5 | ||||
| -rw-r--r-- | webapp/components/signup_team_complete/components/team_signup_welcome_page.jsx | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/webapp/components/signup_team_complete/components/signup_team_complete.jsx b/webapp/components/signup_team_complete/components/signup_team_complete.jsx index 02040c734..8b2096499 100644 --- a/webapp/components/signup_team_complete/components/signup_team_complete.jsx +++ b/webapp/components/signup_team_complete/components/signup_team_complete.jsx @@ -8,6 +8,7 @@ import {FormattedMessage} from 'react-intl'; import {browserHistory} from 'react-router'; import React from 'react'; +import Link from 'react-router'; export default class SignupTeamComplete extends React.Component { constructor(props) { @@ -53,10 +54,10 @@ export default class SignupTeamComplete extends React.Component { return ( <div> <div className='signup-header'> - <a href='/'> + <Link to='/'> <span classNameName='fa fa-chevron-left'/> <FormattedMessage id='web.header.back'/> - </a> + </Link> </div> <div className='col-sm-12'> <div className='signup-team__container'> diff --git a/webapp/components/signup_team_complete/components/team_signup_welcome_page.jsx b/webapp/components/signup_team_complete/components/team_signup_welcome_page.jsx index 78d7cec47..15b708128 100644 --- a/webapp/components/signup_team_complete/components/team_signup_welcome_page.jsx +++ b/webapp/components/signup_team_complete/components/team_signup_welcome_page.jsx @@ -76,7 +76,7 @@ class TeamSignupWelcomePage extends React.Component { Client.signupTeam(email, function success(data) { if (data.follow_link) { - window.location.href = data.follow_link; + browserHistory.push(data.follow_link); } else { this.props.state.wizard = 'finished'; this.props.updateParent(this.props.state); |