Skip to content

Commit f5c7729

Browse files
Fix to allow actions on the network if it belongs to a project (#9550)
1 parent b105716 commit f5c7729

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

ui/src/config/section/network.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,9 @@ export default {
140140
icon: 'edit-outlined',
141141
label: 'label.update.network',
142142
dataView: true,
143-
disabled: (record, user) => { return (record.account !== user.userInfo.account && !['Admin', 'DomainAdmin'].includes(user.userInfo.roletype)) },
143+
disabled: (record, user) => {
144+
return !record.projectid && (record.account !== user.userInfo.account && !['Admin', 'DomainAdmin'].includes(user.userInfo.roletype))
145+
},
144146
popup: true,
145147
component: shallowRef(defineAsyncComponent(() => import('@/views/network/UpdateNetwork.vue')))
146148
},
@@ -150,7 +152,9 @@ export default {
150152
label: 'label.restart.network',
151153
message: 'message.restart.network',
152154
dataView: true,
153-
disabled: (record, user) => { return (record.account !== user.userInfo.account && !['Admin', 'DomainAdmin'].includes(user.userInfo.roletype)) },
155+
disabled: (record, user) => {
156+
return !record.projectid && (record.account !== user.userInfo.account && !['Admin', 'DomainAdmin'].includes(user.userInfo.roletype))
157+
},
154158
args: (record, store, isGroupAction) => {
155159
var fields = []
156160
if (isGroupAction || record.vpcid == null) {
@@ -189,7 +193,9 @@ export default {
189193
label: 'label.action.delete.network',
190194
message: 'message.action.delete.network',
191195
dataView: true,
192-
disabled: (record, user) => { return (record.account !== user.userInfo.account && !['Admin', 'DomainAdmin'].includes(user.userInfo.roletype)) },
196+
disabled: (record, user) => {
197+
return !record.projectid && (record.account !== user.userInfo.account && !['Admin', 'DomainAdmin'].includes(user.userInfo.roletype))
198+
},
193199
groupAction: true,
194200
popup: true,
195201
groupMap: (selection) => { return selection.map(x => { return { id: x } }) }

0 commit comments

Comments
 (0)