summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-11-01 14:28:25 -0400
committerJoram Wilander <jwawilander@gmail.com>2016-11-01 14:28:25 -0400
commit6a4d1713e666bf2d8d6ea10573d0b3b2a2959c62 (patch)
tree5a66592b56f15d83f788b5625e42ce0b75a4e4cc
parent98131a293a1a7013a717789317fa18e6f190abdb (diff)
downloadchat-6a4d1713e666bf2d8d6ea10573d0b3b2a2959c62.tar.gz
chat-6a4d1713e666bf2d8d6ea10573d0b3b2a2959c62.tar.bz2
chat-6a4d1713e666bf2d8d6ea10573d0b3b2a2959c62.zip
Fixing demotion message (#4410)
-rw-r--r--webapp/components/admin_console/admin_team_members_dropdown.jsx4
-rw-r--r--webapp/components/team_members_dropdown.jsx4
2 files changed, 4 insertions, 4 deletions
diff --git a/webapp/components/admin_console/admin_team_members_dropdown.jsx b/webapp/components/admin_console/admin_team_members_dropdown.jsx
index 141e85857..dffc0573a 100644
--- a/webapp/components/admin_console/admin_team_members_dropdown.jsx
+++ b/webapp/components/admin_console/admin_team_members_dropdown.jsx
@@ -69,7 +69,7 @@ export default class AdminTeamMembersDropdown extends React.Component {
handleMakeMember(e) {
e.preventDefault();
const me = UserStore.getCurrentUser();
- if (this.props.user.id === me.id) {
+ if (this.props.user.id === me.id && me.roles.includes('system_admin')) {
this.handleDemoteSystemAdmin(this.props.user, 'member');
} else {
this.doMakeMember();
@@ -131,7 +131,7 @@ export default class AdminTeamMembersDropdown extends React.Component {
handleMakeTeamAdmin(e) {
e.preventDefault();
const me = UserStore.getCurrentUser();
- if (this.props.user.id === me.id) {
+ if (this.props.user.id === me.id && me.roles.includes('system_admin')) {
this.handleDemoteSystemAdmin(this.props.user, 'teamadmin');
} else {
this.doMakeTeamAdmin();
diff --git a/webapp/components/team_members_dropdown.jsx b/webapp/components/team_members_dropdown.jsx
index 0626a82fe..1ae1b8f76 100644
--- a/webapp/components/team_members_dropdown.jsx
+++ b/webapp/components/team_members_dropdown.jsx
@@ -40,7 +40,7 @@ export default class TeamMembersDropdown extends React.Component {
handleMakeMember() {
const me = UserStore.getCurrentUser();
- if (this.props.user.id === me.id) {
+ if (this.props.user.id === me.id && me.roles.includes('system_admin')) {
this.handleDemote(this.props.user, 'team_user');
} else {
Client.updateTeamMemberRoles(
@@ -101,7 +101,7 @@ export default class TeamMembersDropdown extends React.Component {
handleMakeAdmin() {
const me = UserStore.getCurrentUser();
- if (this.props.user.id === me.id) {
+ if (this.props.user.id === me.id && me.roles.includes('system_admin')) {
this.handleDemote(this.props.user, 'team_user team_admin');
} else {
Client.updateTeamMemberRoles(