Skip to content

Commit 3704962

Browse files
committed
compute: allow delete VM group action
Fixes #486 Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
1 parent d78fc60 commit 3704962

3 files changed

Lines changed: 14 additions & 8 deletions

File tree

ui/src/locales/en.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2220,9 +2220,9 @@
22202220
"message.action.delete.volume": "Please confirm that you want to delete this volume.",
22212221
"message.action.delete.vpn.user": "Please confirm that you want to delete the VPN user.",
22222222
"message.action.delete.zone": "Please confirm that you want to delete this zone.",
2223-
"message.action.destroy.instance": "Please confirm that you want to destroy this instance.",
2224-
"message.action.destroy.systemvm": "Please confirm that you want to destroy this System VM.",
2225-
"message.action.destroy.volume": "Please confirm that you want to destroy this volume.",
2223+
"message.action.destroy.instance": "Please confirm that you want to destroy the instance.",
2224+
"message.action.destroy.systemvm": "Please confirm that you want to destroy the System VM.",
2225+
"message.action.destroy.volume": "Please confirm that you want to destroy the volume.",
22262226
"message.action.disable.cluster": "Please confirm that you want to disable this cluster.",
22272227
"message.action.disable.nexusvswitch": "Please confirm that you want to disable this nexus 1000v",
22282228
"message.action.disable.physical.network": "Please confirm that you want to disable this physical network.",

ui/src/views/AutogenView.vue

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
shape="round"
2929
size="small"
3030
icon="reload"
31-
@click="fetchData()">
31+
@click="fetchData({ listall: true, irefresh: true })">
3232
{{ $t('label.refresh') }}
3333
</a-button>
3434
<a-switch
@@ -80,7 +80,7 @@
8080
</a-card>
8181

8282
<div v-show="showAction">
83-
<keep-alive v-if="currentAction.component">
83+
<keep-alive v-if="currentAction.component && (!currentAction.groupAction || this.selectedRowKeys.length === 0)">
8484
<a-modal
8585
:visible="showAction"
8686
:closable="true"
@@ -448,13 +448,19 @@ export default {
448448
}
449449
450450
if (this.$route && this.$route.params && this.$route.params.id) {
451-
this.resource = {}
452451
this.dataView = true
453-
this.$emit('change-resource', this.resource)
452+
if (!('irefresh' in params)) {
453+
this.resource = {}
454+
this.$emit('change-resource', this.resource)
455+
}
454456
} else {
455457
this.dataView = false
456458
}
457459
460+
if ('irefresh' in params) {
461+
delete params.irefresh
462+
}
463+
458464
if ('listview' in this.$refs && this.$refs.listview) {
459465
this.$refs.listview.resetSelection()
460466
}

ui/src/views/compute/DestoryVM.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<template>
1919
<div class="form-layout">
20-
<p v-html="$t('message.action.destroy.instance')" />
20+
<a-alert type="warning" v-html="$t('message.action.destroy.instance')" /><br/>
2121
<a-spin :spinning="loading">
2222
<a-form
2323
:form="form"

0 commit comments

Comments
 (0)