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_username.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_username.jsx')
| -rw-r--r-- | webapp/components/login_username.jsx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webapp/components/login_username.jsx b/webapp/components/login_username.jsx index 5fa27f2d5..71874fa1a 100644 --- a/webapp/components/login_username.jsx +++ b/webapp/components/login_username.jsx @@ -6,6 +6,7 @@ import * as Client from 'utils/client.jsx'; import UserStore from 'stores/user_store.jsx'; import {injectIntl, intlShape, defineMessages, FormattedMessage} from 'react-intl'; +import {browserHistory} from 'react-router'; var holders = defineMessages({ badTeam: { @@ -85,9 +86,9 @@ export default class LoginUsername extends React.Component { const redirect = Utils.getUrlParameter('redirect'); if (redirect) { - window.location.href = decodeURIComponent(redirect); + browserHistory.push(decodeURIComponent(redirect)); } else { - window.location.href = '/' + name + '/channels/town-square'; + browserHistory.push('/' + name + '/channels/town-square'); } }, (err) => { |