From 268bccdf4900a8fd02b79c968e1bdf44b3f2bd39 Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Tue, 31 May 2016 17:10:57 -0300
Subject: PLT-3053 Fix Switching between Team pages in System Console (#3183)

---
 webapp/components/admin_console/team_users.jsx | 2 +-
 webapp/components/admin_console/user_item.jsx  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'webapp/components/admin_console')

diff --git a/webapp/components/admin_console/team_users.jsx b/webapp/components/admin_console/team_users.jsx
index 89fbd0e3a..30e35b311 100644
--- a/webapp/components/admin_console/team_users.jsx
+++ b/webapp/components/admin_console/team_users.jsx
@@ -145,7 +145,7 @@ export default class UserList extends React.Component {
     }
 
     componentWillReceiveProps(newProps) {
-        this.getTeamProfiles(newProps.team.id);
+        this.getTeamProfiles(newProps.params.team);
     }
 
     render() {
diff --git a/webapp/components/admin_console/user_item.jsx b/webapp/components/admin_console/user_item.jsx
index affd4b5a4..a337f2304 100644
--- a/webapp/components/admin_console/user_item.jsx
+++ b/webapp/components/admin_console/user_item.jsx
@@ -193,6 +193,9 @@ export default class UserItem extends React.Component {
 
         const teamMember = this.props.teamMember;
         const user = this.props.user;
+        if (!user || !teamMember) {
+            return <div/>;
+        }
         let currentRoles = (
             <FormattedMessage
                 id='admin.user_item.member'
-- 
cgit v1.2.3-1-g7c22