apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

ui: Fix groupaction for nw cleanup and Notify when groupaction fails (#6333)

Browse Source
This commit is contained in:
David Jumani 2022-04-28 17:51:43 +05:30 committed by GitHub
parent 87a402cc2b
commit b85d5e491a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/src/config/section/network.js
View File

@ -114,9 +114,9 @@ export default {
label: 'label.restart.network', label: 'label.restart.network',
message: 'message.restart.network', message: 'message.restart.network',
dataView: true, dataView: true,
args: (record) => { args: (record, store, isGroupAction) => {
var fields = [] var fields = []
if (record.vpcid == null) { if (isGroupAction || record.vpcid == null) {
fields.push('cleanup') fields.push('cleanup')
} }
fields.push('livepatch') fields.push('livepatch')

26
ui/src/utils/plugins.js
View File

@ -133,23 +133,25 @@ export const pollJobPlugin = {
if (name) { if (name) {
desc = `(${name}) ${desc}` desc = `(${name}) ${desc}`
} }
let onClose = () => {}
if (!bulkAction) { if (!bulkAction) {
let countNotify = store.getters.countNotify let countNotify = store.getters.countNotify
countNotify++ countNotify++
store.commit('SET_COUNT_NOTIFY', countNotify) store.commit('SET_COUNT_NOTIFY', countNotify)
notification.error({ onClose = () => {
top: '65px', let countNotify = store.getters.countNotify
message: errMessage, countNotify > 0 ? countNotify-- : countNotify = 0
description: desc, store.commit('SET_COUNT_NOTIFY', countNotify)
key: jobId, }
duration: 0,
onClose: () => {
let countNotify = store.getters.countNotify
countNotify > 0 ? countNotify-- : countNotify = 0
store.commit('SET_COUNT_NOTIFY', countNotify)
}
})
} }
notification.error({
top: '65px',
message: errMessage,
description: desc,
key: jobId,
duration: 0,
onClose: onClose
})
store.dispatch('AddHeaderNotice', { store.dispatch('AddHeaderNotice', {
key: jobId, key: jobId,
title, title,