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/admin_console/user_item.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/admin_console/user_item.jsx')
-rw-r--r-- | webapp/components/admin_console/user_item.jsx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webapp/components/admin_console/user_item.jsx b/webapp/components/admin_console/user_item.jsx index c6498eafc..91f567d4d 100644 --- a/webapp/components/admin_console/user_item.jsx +++ b/webapp/components/admin_console/user_item.jsx @@ -10,6 +10,7 @@ import TeamStore from 'stores/team_store.jsx'; import {FormattedMessage} from 'react-intl'; import React from 'react'; +import {browserHistory} from 'react-router'; export default class UserItem extends React.Component { constructor(props) { @@ -158,9 +159,9 @@ export default class UserItem extends React.Component { const teamUrl = TeamStore.getCurrentTeamUrl(); if (teamUrl) { - window.location.href = teamUrl; + browserHistory.push(teamUrl); } else { - window.location.href = '/'; + browserHistory.push('/'); } }, (err) => { |