summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
Diffstat (limited to 'webapp')
-rw-r--r--webapp/actions/team_actions.jsx2
-rw-r--r--webapp/components/admin_console/user_item.jsx14
-rw-r--r--webapp/components/team_members_dropdown.jsx14
-rw-r--r--webapp/tests/client_admin.test.jsx22
-rw-r--r--webapp/utils/utils.jsx2
5 files changed, 27 insertions, 27 deletions
diff --git a/webapp/actions/team_actions.jsx b/webapp/actions/team_actions.jsx
index ea6be8504..3bf25c193 100644
--- a/webapp/actions/team_actions.jsx
+++ b/webapp/actions/team_actions.jsx
@@ -24,7 +24,7 @@ export function createTeam(team, onSuccess, onError) {
AppDispatcher.handleServerAction({
type: ActionTypes.CREATED_TEAM,
team: rteam,
- member: {team_id: rteam.id, user_id: UserStore.getCurrentId(), roles: 'admin'}
+ member: {team_id: rteam.id, user_id: UserStore.getCurrentId(), roles: 'team_admin team_user'}
});
browserHistory.push('/' + rteam.name + '/channels/town-square');
diff --git a/webapp/components/admin_console/user_item.jsx b/webapp/components/admin_console/user_item.jsx
index 974ef8bc9..78fdb085c 100644
--- a/webapp/components/admin_console/user_item.jsx
+++ b/webapp/components/admin_console/user_item.jsx
@@ -97,12 +97,12 @@ export default class UserItem extends React.Component {
e.preventDefault();
const me = UserStore.getCurrentUser();
if (this.props.user.id === me.id) {
- this.handleDemote(this.props.user, 'admin');
+ this.handleDemote(this.props.user, 'team_user team_admin');
} else {
Client.updateRoles(
this.props.team.id,
this.props.user.id,
- 'admin',
+ 'team_user team_admin',
() => {
this.props.refreshProfiles();
},
@@ -119,7 +119,7 @@ export default class UserItem extends React.Component {
Client.updateRoles(
this.props.team.id,
this.props.user.id,
- 'system_admin',
+ 'system_user system_admin',
() => {
this.props.refreshProfiles();
},
@@ -238,11 +238,11 @@ export default class UserItem extends React.Component {
const me = UserStore.getCurrentUser();
const email = user.email;
- let showMakeMember = teamMember.roles === 'admin' || user.roles === 'system_admin';
- let showMakeAdmin = teamMember.roles === '' && user.roles !== 'system_admin';
- let showMakeSystemAdmin = user.roles === '' || user.roles === 'admin';
+ let showMakeMember = Utils.isAdmin(teamMember.roles) || Utils.isSystemAdmin(user.roles);
+ let showMakeAdmin = !Utils.isAdmin(teamMember.roles) && !Utils.isSystemAdmin(user.roles);
+ let showMakeSystemAdmin = !Utils.isSystemAdmin(user.roles);
let showMakeActive = false;
- let showMakeNotActive = user.roles !== 'system_admin';
+ let showMakeNotActive = !Utils.isSystemAdmin(user.roles);
const mfaEnabled = global.window.mm_license.IsLicensed === 'true' && global.window.mm_license.MFA === 'true' && global.window.mm_config.EnableMultifactorAuthentication === 'true';
const showMfaReset = mfaEnabled && user.mfa_active;
diff --git a/webapp/components/team_members_dropdown.jsx b/webapp/components/team_members_dropdown.jsx
index 527161103..6b9390ade 100644
--- a/webapp/components/team_members_dropdown.jsx
+++ b/webapp/components/team_members_dropdown.jsx
@@ -37,12 +37,12 @@ export default class TeamMembersDropdown extends React.Component {
handleMakeMember() {
const me = UserStore.getCurrentUser();
if (this.props.user.id === me.id) {
- this.handleDemote(this.props.user, '');
+ this.handleDemote(this.props.user, 'team_user');
} else {
Client.updateRoles(
this.props.teamMember.team_id,
this.props.user.id,
- '',
+ 'team_user',
() => {
AsyncClient.getTeamMembers(TeamStore.getCurrentId());
AsyncClient.getProfiles();
@@ -93,12 +93,12 @@ export default class TeamMembersDropdown extends React.Component {
handleMakeAdmin() {
const me = UserStore.getCurrentUser();
if (this.props.user.id === me.id) {
- this.handleDemote(this.props.user, 'admin');
+ this.handleDemote(this.props.user, 'team_user team_admin');
} else {
Client.updateRoles(
this.props.teamMember.team_id,
this.props.user.id,
- 'admin',
+ 'team_user team_admin',
() => {
AsyncClient.getTeamMembers(TeamStore.getCurrentId());
AsyncClient.getProfiles();
@@ -186,10 +186,10 @@ export default class TeamMembersDropdown extends React.Component {
}
const me = UserStore.getCurrentUser();
- let showMakeMember = teamMember.roles === 'admin' && user.roles !== 'system_admin';
- let showMakeAdmin = teamMember.roles === '' && user.roles !== 'system_admin';
+ let showMakeMember = Utils.isAdmin(teamMember.roles) && !Utils.isSystemAdmin(user.roles);
+ let showMakeAdmin = !Utils.isAdmin(teamMember.roles) && !Utils.isSystemAdmin(user.roles);
let showMakeActive = false;
- let showMakeNotActive = user.roles !== 'system_admin';
+ let showMakeNotActive = Utils.isSystemAdmin(user.roles);
if (user.delete_at > 0) {
currentRoles = (
diff --git a/webapp/tests/client_admin.test.jsx b/webapp/tests/client_admin.test.jsx
index a6a6e1a85..2ed08dc62 100644
--- a/webapp/tests/client_admin.test.jsx
+++ b/webapp/tests/client_admin.test.jsx
@@ -15,7 +15,7 @@ describe('Client.Admin', function() {
done(new Error('should need system admin permissions'));
},
function(err) {
- assert.equal(err.id, 'api.context.system_permissions.app_error');
+ assert.equal(err.id, 'api.context.permissions.app_error');
done();
}
);
@@ -30,7 +30,7 @@ describe('Client.Admin', function() {
done(new Error('should need system admin permissions'));
},
function(err) {
- assert.equal(err.id, 'api.context.system_permissions.app_error');
+ assert.equal(err.id, 'api.context.permissions.app_error');
done();
}
);
@@ -45,7 +45,7 @@ describe('Client.Admin', function() {
done(new Error('should need system admin permissions'));
},
function(err) {
- assert.equal(err.id, 'api.context.system_permissions.app_error');
+ assert.equal(err.id, 'api.context.permissions.app_error');
done();
}
);
@@ -69,7 +69,7 @@ describe('Client.Admin', function() {
done(new Error('should need system admin permissions'));
},
function(err) {
- assert.equal(err.id, 'api.context.system_permissions.app_error');
+ assert.equal(err.id, 'api.context.permissions.app_error');
done();
}
);
@@ -84,7 +84,7 @@ describe('Client.Admin', function() {
done(new Error('should need system admin permissions'));
},
function(err) {
- assert.equal(err.id, 'api.context.system_permissions.app_error');
+ assert.equal(err.id, 'api.context.permissions.app_error');
done();
}
);
@@ -99,7 +99,7 @@ describe('Client.Admin', function() {
done(new Error('should need system admin permissions'));
},
function(err) {
- assert.equal(err.id, 'api.context.system_permissions.app_error');
+ assert.equal(err.id, 'api.context.permissions.app_error');
done();
}
);
@@ -114,7 +114,7 @@ describe('Client.Admin', function() {
done(new Error('should need system admin permissions'));
},
function(err) {
- assert.equal(err.id, 'api.context.system_permissions.app_error');
+ assert.equal(err.id, 'api.context.permissions.app_error');
done();
}
);
@@ -131,7 +131,7 @@ describe('Client.Admin', function() {
done(new Error('should need system admin permissions'));
},
function(err) {
- assert.equal(err.id, 'api.context.system_permissions.app_error');
+ assert.equal(err.id, 'api.context.permissions.app_error');
done();
}
);
@@ -148,7 +148,7 @@ describe('Client.Admin', function() {
done(new Error('should need system admin permissions'));
},
function(err) {
- assert.equal(err.id, 'api.context.system_permissions.app_error');
+ assert.equal(err.id, 'api.context.permissions.app_error');
done();
}
);
@@ -167,7 +167,7 @@ describe('Client.Admin', function() {
done(new Error('should need system admin permissions'));
},
function(err) {
- assert.equal(err.id, 'api.context.system_permissions.app_error');
+ assert.equal(err.id, 'api.context.permissions.app_error');
done();
}
);
@@ -186,7 +186,7 @@ describe('Client.Admin', function() {
done(new Error('should need system admin permissions'));
},
function(err) {
- assert.equal(err.id, 'api.context.system_permissions.app_error');
+ assert.equal(err.id, 'api.context.permissions.app_error');
done();
}
);
diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx
index dda1d0986..4dc9aab86 100644
--- a/webapp/utils/utils.jsx
+++ b/webapp/utils/utils.jsx
@@ -56,7 +56,7 @@ export function isInRole(roles, inRole) {
}
export function isAdmin(roles) {
- if (isInRole(roles, 'admin')) {
+ if (isInRole(roles, 'team_admin')) {
return true;
}
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-03 02:35:07 +0000