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/team_signup_with_ldap.jsx | |
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/team_signup_with_ldap.jsx')
-rw-r--r-- | webapp/components/team_signup_with_ldap.jsx | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/webapp/components/team_signup_with_ldap.jsx b/webapp/components/team_signup_with_ldap.jsx index e36d4a42b..9d812e8ee 100644 --- a/webapp/components/team_signup_with_ldap.jsx +++ b/webapp/components/team_signup_with_ldap.jsx @@ -7,6 +7,7 @@ import * as utils from 'utils/utils.jsx'; import * as Client from 'utils/client.jsx'; import {injectIntl, intlShape, defineMessages, FormattedMessage} from 'react-intl'; +import {browserHistory} from 'react-router'; const holders = defineMessages({ team_error: { @@ -112,7 +113,7 @@ class LdapSignUpPage extends React.Component { Client.loginByLdap(teamSignup.team.name, id, password, () => { - window.location.href = '/' + teamSignup.team.name + '/channels/town-square'; + browserHistory.push('/' + teamSignup.team.name + '/channels/town-square'); }, (err) => { $('#ldap-button').button('reset'); @@ -218,14 +219,6 @@ class LdapSignUpPage extends React.Component { </a> {serverError} </div> - <div className='form-group margin--extra-2x'> - <span><a href='/find_team'> - <FormattedMessage - id='ldap_signup.find' - defaultMessage='Find my teams' - /> - </a></span> - </div> </form> ); } @@ -235,4 +228,4 @@ LdapSignUpPage.propTypes = { intl: intlShape.isRequired }; -export default injectIntl(LdapSignUpPage);
\ No newline at end of file +export default injectIntl(LdapSignUpPage); |