diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-10-13 22:53:01 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-10-13 22:53:01 -0400 |
| commit | 52a87446ce75462d6f1c489d8b7fd487d759a19f (patch) | |
| tree | 5f9efb4ab142716a47b138e0d05d11a44d2ef1df | |
| parent | a4adc9b95ee821d91b54235b0883a300e10da114 (diff) | |
| parent | a1328fc8b5d03ec73f1bad588d2f0bb688b1c206 (diff) | |
| download | chat-52a87446ce75462d6f1c489d8b7fd487d759a19f.tar.gz chat-52a87446ce75462d6f1c489d8b7fd487d759a19f.tar.bz2 chat-52a87446ce75462d6f1c489d8b7fd487d759a19f.zip | |
Merge pull request #1017 from stasvovk/PLT-589
PLT-589: changed Admin to Team Admin in Manage Team members
| -rw-r--r-- | web/react/components/admin_console/user_item.jsx | 6 | ||||
| -rw-r--r-- | web/react/components/member_list_team_item.jsx | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/web/react/components/admin_console/user_item.jsx b/web/react/components/admin_console/user_item.jsx index 665ccd719..395e22e6c 100644 --- a/web/react/components/admin_console/user_item.jsx +++ b/web/react/components/admin_console/user_item.jsx @@ -111,8 +111,10 @@ export default class UserItem extends React.Component { const user = this.props.user; let currentRoles = 'Member'; if (user.roles.length > 0) { - if (user.roles.indexOf('system_admin') > -1) { + if (Utils.isSystemAdmin(user.roles)) { currentRoles = 'System Admin'; + } else if (Utils.isAdmin(user.roles)) { + currentRoles = 'Team Admin'; } else { currentRoles = user.roles.charAt(0).toUpperCase() + user.roles.slice(1); } @@ -158,7 +160,7 @@ export default class UserItem extends React.Component { href='#' onClick={this.handleMakeAdmin} > - {'Make Admin'} + {'Make Team Admin'} </a> </li> ); diff --git a/web/react/components/member_list_team_item.jsx b/web/react/components/member_list_team_item.jsx index 9a104aa32..3af1d3800 100644 --- a/web/react/components/member_list_team_item.jsx +++ b/web/react/components/member_list_team_item.jsx @@ -82,8 +82,10 @@ export default class MemberListTeamItem extends React.Component { const timestamp = UserStore.getCurrentUser().update_at; if (user.roles.length > 0) { - if (user.roles.indexOf('system_admin') > -1) { + if (Utils.isSystemAdmin(user.roles)) { currentRoles = 'System Admin'; + } else if (Utils.isAdmin(user.roles)) { + currentRoles = 'Team Admin'; } else { currentRoles = user.roles.charAt(0).toUpperCase() + user.roles.slice(1); } @@ -112,7 +114,7 @@ export default class MemberListTeamItem extends React.Component { href='#' onClick={this.handleMakeAdmin} > - {'Make Admin'} + {'Make Team Admin'} </a> </li> ); |