refactor(core): Remove roleId indirection (no-changelog) (#8413)
This commit is contained in:
committed by
GitHub
parent
1affebd85e
commit
d6deceacde
@@ -65,7 +65,7 @@
|
||||
<template #actions="{ user }">
|
||||
<n8n-select
|
||||
v-if="user.id !== usersStore.currentUserId"
|
||||
:model-value="user?.globalRole?.name || 'member'"
|
||||
:model-value="user?.role || 'global:member'"
|
||||
:disabled="!canUpdateRole"
|
||||
data-test-id="user-role-select"
|
||||
@update:modelValue="onRoleChange(user, $event)"
|
||||
@@ -207,14 +207,14 @@ export default defineComponent({
|
||||
},
|
||||
async onReinvite(userId: string) {
|
||||
const user = this.usersStore.getUserById(userId);
|
||||
if (user?.email && user?.globalRole) {
|
||||
if (!['admin', 'member'].includes(user.globalRole.name)) {
|
||||
if (user?.email && user?.role) {
|
||||
if (!['global:admin', 'global:member'].includes(user.role)) {
|
||||
throw new Error('Invalid role name on reinvite');
|
||||
}
|
||||
try {
|
||||
await this.usersStore.reinviteUser({
|
||||
email: user.email,
|
||||
role: user.globalRole.name as InvitableRoleName,
|
||||
role: user.role as InvitableRoleName,
|
||||
});
|
||||
this.showToast({
|
||||
type: 'success',
|
||||
|
||||
Reference in New Issue
Block a user