diff options
author | Corey Hulen <corey@hulen.com> | 2016-05-06 11:28:22 -0700 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-05-06 14:28:22 -0400 |
commit | 6c75662b824491a20a757a5eec59556a866374b5 (patch) | |
tree | 2f531a680aaa45bc915d51764eb846bc1b80fa68 /webapp/components/team_members_dropdown.jsx | |
parent | 4f799b980fd457e5dc97d2427a154576d7a5eded (diff) | |
download | chat-6c75662b824491a20a757a5eec59556a866374b5.tar.gz chat-6c75662b824491a20a757a5eec59556a866374b5.tar.bz2 chat-6c75662b824491a20a757a5eec59556a866374b5.zip |
PLT-2697 Fixing team admins (#2900)
* PLT-2697 Fixing team admins
* Fixing eslint error
* Fixing loc issues
* Fixing func
* Fixing func
Diffstat (limited to 'webapp/components/team_members_dropdown.jsx')
-rw-r--r-- | webapp/components/team_members_dropdown.jsx | 104 |
1 files changed, 55 insertions, 49 deletions
diff --git a/webapp/components/team_members_dropdown.jsx b/webapp/components/team_members_dropdown.jsx index 251c2ce3b..b65b9e050 100644 --- a/webapp/components/team_members_dropdown.jsx +++ b/webapp/components/team_members_dropdown.jsx @@ -39,9 +39,11 @@ export default class TeamMembersDropdown extends React.Component { this.handleDemote(this.props.user, ''); } else { Client.updateRoles( + this.props.teamMember.team_id, this.props.user.id, '', () => { + AsyncClient.getTeamMembers(TeamStore.getCurrentId()); AsyncClient.getProfiles(); }, (err) => { @@ -53,6 +55,7 @@ export default class TeamMembersDropdown extends React.Component { handleMakeActive() { Client.updateActive(this.props.user.id, true, () => { + AsyncClient.getTeamMembers(TeamStore.getCurrentId()); AsyncClient.getProfiles(); AsyncClient.getChannelExtraInfo(ChannelStore.getCurrentId()); }, @@ -64,6 +67,7 @@ export default class TeamMembersDropdown extends React.Component { handleMakeNotActive() { Client.updateActive(this.props.user.id, false, () => { + AsyncClient.getTeamMembers(TeamStore.getCurrentId()); AsyncClient.getProfiles(); AsyncClient.getChannelExtraInfo(ChannelStore.getCurrentId()); }, @@ -78,9 +82,11 @@ export default class TeamMembersDropdown extends React.Component { this.handleDemote(this.props.user, 'admin'); } else { Client.updateRoles( + this.props.teamMember.team_id, this.props.user.id, 'admin', () => { + AsyncClient.getTeamMembers(TeamStore.getCurrentId()); AsyncClient.getProfiles(); }, (err) => { @@ -109,9 +115,13 @@ export default class TeamMembersDropdown extends React.Component { } handleDemoteSubmit() { Client.updateRoles( + this.props.teamMember.team_id, this.props.user.id, this.state.newRole, () => { + AsyncClient.getTeamMembers(TeamStore.getCurrentId()); + AsyncClient.getProfiles(); + const teamUrl = TeamStore.getCurrentTeamUrl(); if (teamUrl) { browserHistory.push(teamUrl); @@ -143,30 +153,26 @@ export default class TeamMembersDropdown extends React.Component { /> ); - if (user.roles.length > 0) { - if (Utils.isSystemAdmin(user.roles)) { - currentRoles = ( - <FormattedMessage - id='team_members_dropdown.systemAdmin' - defaultMessage='System Admin' - /> - ); - } else if (Utils.isAdmin(user.roles)) { - currentRoles = ( - <FormattedMessage - id='team_members_dropdown.teamAdmin' - defaultMessage='Team Admin' - /> - ); - } else { - currentRoles = user.roles.charAt(0).toUpperCase() + user.roles.slice(1); - } + if (teamMember.roles.length > 0 && Utils.isAdmin(teamMember.roles)) { + currentRoles = ( + <FormattedMessage + id='team_members_dropdown.teamAdmin' + defaultMessage='Team Admin' + /> + ); } - let showMakeMember = teamMember.roles === 'admin' || user.roles === 'system_admin'; + if (user.roles.length > 0 && Utils.isSystemAdmin(user.roles)) { + currentRoles = ( + <FormattedMessage + id='team_members_dropdown.systemAdmin' + defaultMessage='System Admin' + /> + ); + } - //let showMakeAdmin = teamMember.roles === '' && user.roles !== 'system_admin'; - let showMakeAdmin = false; + let showMakeMember = teamMember.roles === 'admin' || user.roles === 'system_admin'; + let showMakeAdmin = teamMember.roles === '' && user.roles !== 'system_admin'; let showMakeActive = false; let showMakeNotActive = user.roles !== 'system_admin'; @@ -221,38 +227,38 @@ export default class TeamMembersDropdown extends React.Component { let makeActive = null; if (showMakeActive) { - makeActive = ( - <li role='presentation'> - <a - role='menuitem' - href='#' - onClick={this.handleMakeActive} - > - <FormattedMessage - id='team_members_dropdown.makeActive' - defaultMessage='Make Active' - /> - </a> - </li> - ); + // makeActive = ( + // <li role='presentation'> + // <a + // role='menuitem' + // href='#' + // onClick={this.handleMakeActive} + // > + // <FormattedMessage + // id='team_members_dropdown.makeActive' + // defaultMessage='Make Active' + // /> + // </a> + // </li> + // ); } let makeNotActive = null; if (showMakeNotActive) { - makeNotActive = ( - <li role='presentation'> - <a - role='menuitem' - href='#' - onClick={this.handleMakeNotActive} - > - <FormattedMessage - id='team_members_dropdown.makeInactive' - defaultMessage='Make Inactive' - /> - </a> - </li> - ); + // makeNotActive = ( + // <li role='presentation'> + // <a + // role='menuitem' + // href='#' + // onClick={this.handleMakeNotActive} + // > + // <FormattedMessage + // id='team_members_dropdown.makeInactive' + // defaultMessage='Make Inactive' + // /> + // </a> + // </li> + // ); } const me = UserStore.getCurrentUser(); let makeDemoteModal = null; |