summaryrefslogtreecommitdiffstats
path: root/web/react/components/admin_console
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-02-14 08:24:09 -0500
committerJoram Wilander <jwawilander@gmail.com>2016-02-14 08:24:09 -0500
commit89f7e8cf2fad46d8f521560238ad0f682f038da9 (patch)
tree1e31669eea6a2e337e2c4d8d2d6e25c89c734d2c /web/react/components/admin_console
parent54cba38f3b7c1941dd5e63ac0152819a34aefa86 (diff)
parenta31f7c9a75538757a9ef7837491a5c9470cd2c35 (diff)
downloadchat-89f7e8cf2fad46d8f521560238ad0f682f038da9.tar.gz
chat-89f7e8cf2fad46d8f521560238ad0f682f038da9.tar.bz2
chat-89f7e8cf2fad46d8f521560238ad0f682f038da9.zip
Merge pull request #2123 from hmhealey/plt1711
PLT-1711 Prevent the admin console from switching to a team that is being remo…
Diffstat (limited to 'web/react/components/admin_console')
-rw-r--r--web/react/components/admin_console/admin_sidebar.jsx1
1 files changed, 1 insertions, 0 deletions
diff --git a/web/react/components/admin_console/admin_sidebar.jsx b/web/react/components/admin_console/admin_sidebar.jsx
index eadd8d412..795b19eec 100644
--- a/web/react/components/admin_console/admin_sidebar.jsx
+++ b/web/react/components/admin_console/admin_sidebar.jsx
@@ -50,6 +50,7 @@ export default class AdminSidebar extends React.Component {
removeTeam(teamId, e) {
e.preventDefault();
+ e.stopPropagation();
Reflect.deleteProperty(this.props.selectedTeams, teamId);
this.props.removeSelectedTeam(teamId);