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/login_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/login_ldap.jsx')
-rw-r--r-- | webapp/components/login_ldap.jsx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/webapp/components/login_ldap.jsx b/webapp/components/login_ldap.jsx index b9997dec4..59ff973dc 100644 --- a/webapp/components/login_ldap.jsx +++ b/webapp/components/login_ldap.jsx @@ -5,6 +5,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({ badTeam: { @@ -74,9 +75,9 @@ class LoginLdap extends React.Component { () => { const redirect = Utils.getUrlParameter('redirect'); if (redirect) { - window.location.href = decodeURIComponent(redirect); + browserHistory.push(decodeURIComponent(redirect)); } else { - window.location.href = '/' + teamName + '/channels/town-square'; + browserHistory.push('/' + teamName + '/channels/town-square'); } }, (err) => { @@ -141,4 +142,4 @@ LoginLdap.propTypes = { teamName: React.PropTypes.string.isRequired }; -export default injectIntl(LoginLdap);
\ No newline at end of file +export default injectIntl(LoginLdap); |