Skip to content

Commit 601b07d

Browse files
committed
ui: allow actions for other users of root admin
Fixes #10306 Signed-off-by: Abhishek Kumar <[email protected]>
1 parent cca8b2f commit 601b07d

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

ui/src/config/section/user.js

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,10 @@ export default {
105105
message: 'message.enable.user',
106106
dataView: true,
107107
show: (record, store) => {
108-
return ['Admin', 'DomainAdmin'].includes(store.userInfo.roletype) && !record.isdefault &&
109-
!(record.domain === 'ROOT' && record.account === 'admin' && record.accounttype === 1) &&
110-
['disabled', 'locked'].includes(record.state)
108+
if (!['disabled', 'locked'].includes(record.state) || record.isdefault || !['Admin', 'DomainAdmin'].includes(store.userInfo.roletype)) {
109+
return false
110+
}
111+
return ![1, 4].includes(record.accounttype) || store.userInfo.roletype === 'Admin'
111112
}
112113
},
113114
{
@@ -117,9 +118,10 @@ export default {
117118
message: 'message.disable.user',
118119
dataView: true,
119120
show: (record, store) => {
120-
return ['Admin', 'DomainAdmin'].includes(store.userInfo.roletype) && !record.isdefault &&
121-
!(record.domain === 'ROOT' && record.account === 'admin' && record.accounttype === 1) &&
122-
record.state === 'enabled'
121+
if (record.state !== 'enabled' || record.isdefault || !['Admin', 'DomainAdmin'].includes(store.userInfo.roletype)) {
122+
return false
123+
}
124+
return ![1, 4].includes(record.accounttype) || (store.userInfo.roletype === 'Admin' && record.id !== store.userInfo.id)
123125
}
124126
},
125127
{
@@ -131,9 +133,10 @@ export default {
131133
dataView: true,
132134
popup: true,
133135
show: (record, store) => {
134-
return ['Admin', 'DomainAdmin'].includes(store.userInfo.roletype) && !record.isdefault &&
135-
!(record.domain === 'ROOT' && record.account === 'admin' && record.accounttype === 1) &&
136-
record.state === 'enabled'
136+
if (record.state !== 'enabled' || record.isdefault || !['Admin', 'DomainAdmin'].includes(store.userInfo.roletype)) {
137+
return false
138+
}
139+
return ![1, 4].includes(record.accounttype) || (store.userInfo.roletype === 'Admin' && record.id !== store.userInfo.id)
137140
}
138141
},
139142
{

0 commit comments

Comments
 (0)