Fix a bug with moving users to different roles, still using old data structures.
This commit is contained in:
@@ -324,10 +324,10 @@ async function performUserDeletion(userUuid, userName, orgUuid) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function moveUserToRole(user, targetRoleUuid) {
|
async function moveUserToRole(userUuid, user, targetRoleUuid) {
|
||||||
if (user.role_uuid === targetRoleUuid) return
|
if (user.role === targetRoleUuid) return
|
||||||
try {
|
try {
|
||||||
await apiJson(`/auth/api/admin/users/${user.uuid}/role`, {
|
await apiJson(`/auth/api/admin/users/${userUuid}/role`, {
|
||||||
method: 'PATCH',
|
method: 'PATCH',
|
||||||
body: { role_uuid: targetRoleUuid }
|
body: { role_uuid: targetRoleUuid }
|
||||||
})
|
})
|
||||||
@@ -353,7 +353,7 @@ function onRoleDrop(e, org, role) {
|
|||||||
const data = JSON.parse(e.dataTransfer.getData('text/plain'))
|
const data = JSON.parse(e.dataTransfer.getData('text/plain'))
|
||||||
if (data.org !== org.uuid) return // only within same org
|
if (data.org !== org.uuid) return // only within same org
|
||||||
const user = org.users[data.user_uuid]
|
const user = org.users[data.user_uuid]
|
||||||
if (user) moveUserToRole(user, role.uuid)
|
if (user) moveUserToRole(data.user_uuid, user, role.uuid)
|
||||||
} catch (_) { /* ignore */ }
|
} catch (_) { /* ignore */ }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user