summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-08-15 08:20:38 -0500
committerJoram Wilander <jwawilander@gmail.com>2016-08-15 09:20:38 -0400
commitb972d2adba49996b13d4e0bb75b5b3f28e039466 (patch)
tree74d4dbb13ae7a802706bcac360252ea55c0b5dd4 /webapp
parent6d6f1c8d8c14580c42eae556a7759c8b404d7beb (diff)
downloadchat-b972d2adba49996b13d4e0bb75b5b3f28e039466.tar.gz
chat-b972d2adba49996b13d4e0bb75b5b3f28e039466.tar.bz2
chat-b972d2adba49996b13d4e0bb75b5b3f28e039466.zip
PLT-3844 Fix Not redirected out of system console after demoting self from System Admin (#3797)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/admin_console/user_item.jsx6
1 files changed, 3 insertions, 3 deletions
diff --git a/webapp/components/admin_console/user_item.jsx b/webapp/components/admin_console/user_item.jsx
index b4e74057f..974ef8bc9 100644
--- a/webapp/components/admin_console/user_item.jsx
+++ b/webapp/components/admin_console/user_item.jsx
@@ -11,7 +11,6 @@ import TeamStore from 'stores/team_store.jsx';
import {FormattedMessage, FormattedHTMLMessage} from 'react-intl';
import React from 'react';
-import {browserHistory} from 'react-router/es6';
export default class UserItem extends React.Component {
constructor(props) {
@@ -183,9 +182,10 @@ export default class UserItem extends React.Component {
const teamUrl = TeamStore.getCurrentTeamUrl();
if (teamUrl) {
- browserHistory.push(teamUrl);
+ // the channel is added to the URL cause endless loading not being fully fixed
+ window.location.href = teamUrl + '/channels/town-square';
} else {
- browserHistory.push('/');
+ window.location.href = '/';
}
},
(err) => {