diff options
| author | enahum <nahumhbl@gmail.com> | 2016-05-31 17:10:57 -0300 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-05-31 16:10:57 -0400 |
| commit | 268bccdf4900a8fd02b79c968e1bdf44b3f2bd39 (patch) | |
| tree | 2e4bcd4e9ebc72576a935e9a09d4e343f8947785 /webapp/components/admin_console | |
| parent | 0d6bf6756bc1087fad190e5770febdc28873d6b2 (diff) | |
| download | chat-268bccdf4900a8fd02b79c968e1bdf44b3f2bd39.tar.gz chat-268bccdf4900a8fd02b79c968e1bdf44b3f2bd39.tar.bz2 chat-268bccdf4900a8fd02b79c968e1bdf44b3f2bd39.zip | |
PLT-3053 Fix Switching between Team pages in System Console (#3183)
Diffstat (limited to 'webapp/components/admin_console')
| -rw-r--r-- | webapp/components/admin_console/team_users.jsx | 2 | ||||
| -rw-r--r-- | webapp/components/admin_console/user_item.jsx | 3 |
2 files changed, 4 insertions, 1 deletions
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' |