etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui: allow actions for other users of root admin (#11319) 

Fixes #10306

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
This commit is contained in:
Abhishek Kumar 2026-01-28 19:36:04 +05:30 committed by GitHub
parent 6a04e14f87
commit 9fc93af85f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ui/src/config/section/user.js
View File

@ -105,9 +105,10 @@ export default {
message: 'message.enable.user',
dataView: true,
show: (record, store) => {
return ['Admin', 'DomainAdmin'].includes(store.userInfo.roletype) && !record.isdefault &&
!(record.domain === 'ROOT' && record.account === 'admin' && record.accounttype === 1) &&
['disabled', 'locked'].includes(record.state)
if (!['disabled', 'locked'].includes(record.state) || record.isdefault || !['Admin', 'DomainAdmin'].includes(store.userInfo.roletype)) {
return false
}
return ![1, 4].includes(record.accounttype) || store.userInfo.roletype === 'Admin'
}
},
{
@ -117,9 +118,10 @@ export default {
message: 'message.disable.user',
dataView: true,
show: (record, store) => {
return ['Admin', 'DomainAdmin'].includes(store.userInfo.roletype) && !record.isdefault &&
!(record.domain === 'ROOT' && record.account === 'admin' && record.accounttype === 1) &&
record.state === 'enabled'
if (record.state !== 'enabled' || record.isdefault || !['Admin', 'DomainAdmin'].includes(store.userInfo.roletype)) {
return false
}
return ![1, 4].includes(record.accounttype) || (store.userInfo.roletype === 'Admin' && record.id !== store.userInfo.id)
}
},
{
@ -131,9 +133,10 @@ export default {
dataView: true,
popup: true,
show: (record, store) => {
return ['Admin', 'DomainAdmin'].includes(store.userInfo.roletype) && !record.isdefault &&
!(record.domain === 'ROOT' && record.account === 'admin' && record.accounttype === 1) &&
record.state === 'enabled'
if (record.state !== 'enabled' || record.isdefault || !['Admin', 'DomainAdmin'].includes(store.userInfo.roletype)) {
return false
}
return ![1, 4].includes(record.accounttype) || (store.userInfo.roletype === 'Admin' && record.id !== store.userInfo.id)
}
},
{