diff options
author | =Corey Hulen <corey@hulen.com> | 2016-03-14 10:23:51 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2016-03-14 10:23:51 -0700 |
commit | ea3f25924ea64a2dd1e73624c0d30824e1efb240 (patch) | |
tree | a4a2b2bdc37bd675fb89837713995ad44a27427b /web/react/components/admin_console/admin_navbar_dropdown.jsx | |
parent | 397ebec88c2db3569efd77238bf877e976492d34 (diff) | |
parent | bf7ae0711743926cfbb031675cc3320d7a942465 (diff) | |
download | chat-ea3f25924ea64a2dd1e73624c0d30824e1efb240.tar.gz chat-ea3f25924ea64a2dd1e73624c0d30824e1efb240.tar.bz2 chat-ea3f25924ea64a2dd1e73624c0d30824e1efb240.zip |
Merge branch 'master' into PLT-2115
Diffstat (limited to 'web/react/components/admin_console/admin_navbar_dropdown.jsx')
-rw-r--r-- | web/react/components/admin_console/admin_navbar_dropdown.jsx | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/web/react/components/admin_console/admin_navbar_dropdown.jsx b/web/react/components/admin_console/admin_navbar_dropdown.jsx index dc0b3c4cb..ae95f5a3a 100644 --- a/web/react/components/admin_console/admin_navbar_dropdown.jsx +++ b/web/react/components/admin_console/admin_navbar_dropdown.jsx @@ -2,13 +2,14 @@ // See License.txt for license information. import * as Utils from '../../utils/utils.jsx'; -import * as Client from '../../utils/client.jsx'; import TeamStore from '../../stores/team_store.jsx'; import Constants from '../../utils/constants.jsx'; import {FormattedMessage} from 'mm-intl'; +import {Link} from 'react-router'; + function getStateFromStores() { return {currentTeam: TeamStore.getCurrent()}; } @@ -18,16 +19,9 @@ export default class AdminNavbarDropdown extends React.Component { super(props); this.blockToggle = false; - this.handleLogoutClick = this.handleLogoutClick.bind(this); - this.state = getStateFromStores(); } - handleLogoutClick(e) { - e.preventDefault(); - Client.logout(); - } - componentDidMount() { $(ReactDOM.findDOMNode(this.refs.dropdown)).on('hide.bs.dropdown', () => { this.blockToggle = true; @@ -78,15 +72,12 @@ export default class AdminNavbarDropdown extends React.Component { </a> </li> <li> - <a - href='#' - onClick={this.handleLogoutClick} - > + <Link to={Utils.getTeamURLFromAddressBar() + '/logout'}> <FormattedMessage id='admin.nav.logout' defaultMessage='Logout' /> - </a> + </Link> </li> <li className='divider'></li> <li> @@ -116,4 +107,4 @@ export default class AdminNavbarDropdown extends React.Component { </ul> ); } -}
\ No newline at end of file +} |