diff options
Diffstat (limited to 'webapp/components/admin_console')
| -rw-r--r-- | webapp/components/admin_console/admin_navbar_dropdown.jsx | 29 | ||||
| -rw-r--r-- | webapp/components/admin_console/user_item.jsx | 5 |
2 files changed, 6 insertions, 28 deletions
diff --git a/webapp/components/admin_console/admin_navbar_dropdown.jsx b/webapp/components/admin_console/admin_navbar_dropdown.jsx index 56b78448a..527f97959 100644 --- a/webapp/components/admin_console/admin_navbar_dropdown.jsx +++ b/webapp/components/admin_console/admin_navbar_dropdown.jsx @@ -63,8 +63,8 @@ export default class AdminNavbarDropdown extends React.Component { role='menu' > <li> - <a - href={Utils.getWindowLocationOrigin() + '/' + this.state.currentTeam.name} + <Link + to={Utils.getWindowLocationOrigin() + '/' + this.state.currentTeam.name + '/channels/town-square'} > <FormattedMessage id='admin.nav.switch' @@ -73,7 +73,7 @@ export default class AdminNavbarDropdown extends React.Component { display_name: this.state.currentTeam.display_name }} /> - </a> + </Link> </li> <li> <Link to={Utils.getTeamURLFromAddressBar() + '/logout'}> @@ -83,29 +83,6 @@ export default class AdminNavbarDropdown extends React.Component { /> </Link> </li> - <li className='divider'></li> - <li> - <a - target='_blank' - href='/static/help/help.html' - > - <FormattedMessage - id='admin.nav.help' - defaultMessage='Help' - /> - </a> - </li> - <li> - <a - target='_blank' - href='/static/help/report_problem.html' - > - <FormattedMessage - id='admin.nav.report' - defaultMessage='Report a Problem' - /> - </a> - </li> </ul> </li> </ul> 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) => { |