From b5a499977ec212139444974255a27f8e66d0befd Mon Sep 17 00:00:00 2001 From: Stas Vovk Date: Mon, 12 Oct 2015 16:06:23 +0300 Subject: changed Admin to Team Admin in Manage Team members --- web/react/components/member_list_team_item.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/react/components/member_list_team_item.jsx b/web/react/components/member_list_team_item.jsx index 9a104aa32..f67952bff 100644 --- a/web/react/components/member_list_team_item.jsx +++ b/web/react/components/member_list_team_item.jsx @@ -84,6 +84,8 @@ export default class MemberListTeamItem extends React.Component { if (user.roles.length > 0) { if (user.roles.indexOf('system_admin') > -1) { currentRoles = 'System Admin'; + } else if (user.roles === 'admin') { + 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'} ); -- cgit v1.2.3-1-g7c22 From 8d8e8ec41eba1aaac717819be3e688f8076aeba4 Mon Sep 17 00:00:00 2001 From: Stas Vovk Date: Mon, 12 Oct 2015 22:04:00 +0300 Subject: changed Admin to Team Admin in admin console --- web/react/components/admin_console/user_item.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/react/components/admin_console/user_item.jsx b/web/react/components/admin_console/user_item.jsx index 665ccd719..981290c91 100644 --- a/web/react/components/admin_console/user_item.jsx +++ b/web/react/components/admin_console/user_item.jsx @@ -113,6 +113,8 @@ export default class UserItem extends React.Component { if (user.roles.length > 0) { if (user.roles.indexOf('system_admin') > -1) { currentRoles = 'System Admin'; + } else if (user.roles === 'admin') { + 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'} ); -- cgit v1.2.3-1-g7c22 From 450b56c1bd428115f66d6f0bf87691e50aaaaffa Mon Sep 17 00:00:00 2001 From: Stas Vovk Date: Tue, 13 Oct 2015 13:20:56 +0300 Subject: replaced constructions like user.roles === 'admin' by Utils.isAdmin(user.roles) in manage members --- web/react/components/admin_console/user_item.jsx | 4 ++-- web/react/components/member_list_team_item.jsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/react/components/admin_console/user_item.jsx b/web/react/components/admin_console/user_item.jsx index 981290c91..395e22e6c 100644 --- a/web/react/components/admin_console/user_item.jsx +++ b/web/react/components/admin_console/user_item.jsx @@ -111,9 +111,9 @@ 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 (user.roles === 'admin') { + } else if (Utils.isAdmin(user.roles)) { currentRoles = 'Team Admin'; } else { currentRoles = user.roles.charAt(0).toUpperCase() + user.roles.slice(1); diff --git a/web/react/components/member_list_team_item.jsx b/web/react/components/member_list_team_item.jsx index f67952bff..3af1d3800 100644 --- a/web/react/components/member_list_team_item.jsx +++ b/web/react/components/member_list_team_item.jsx @@ -82,9 +82,9 @@ 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 (user.roles === 'admin') { + } else if (Utils.isAdmin(user.roles)) { currentRoles = 'Team Admin'; } else { currentRoles = user.roles.charAt(0).toUpperCase() + user.roles.slice(1); -- cgit v1.2.3-1-g7c22