[cloudstack-primate] branch master updated: compute: allow delete VM group action

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack-primate.git


The following commit(s) were added to refs/heads/master by this push:
     new 85cabe6  compute: allow delete VM group action
85cabe6 is described below

commit 85cabe647164ab580f85e5b9791cea981086f1e8
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Sat Jul 4 23:06:44 2020 +0530

    compute: allow delete VM group action
    
    Fixes #486
    
    Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
---
 src/locales/en.json             |  6 +++---
 src/views/AutogenView.vue       | 14 ++++++++++----
 src/views/compute/DestoryVM.vue |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index c541623..a466815 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -2220,9 +2220,9 @@
 "message.action.delete.volume": "Please confirm that you want to delete this volume.",
 "message.action.delete.vpn.user": "Please confirm that you want to delete the VPN user.",
 "message.action.delete.zone": "Please confirm that you want to delete this zone.",
-"message.action.destroy.instance": "Please confirm that you want to destroy this instance.",
-"message.action.destroy.systemvm": "Please confirm that you want to destroy this System VM.",
-"message.action.destroy.volume": "Please confirm that you want to destroy this volume.",
+"message.action.destroy.instance": "Please confirm that you want to destroy the instance.",
+"message.action.destroy.systemvm": "Please confirm that you want to destroy the System VM.",
+"message.action.destroy.volume": "Please confirm that you want to destroy the volume.",
 "message.action.disable.cluster": "Please confirm that you want to disable this cluster.",
 "message.action.disable.nexusvswitch": "Please confirm that you want to disable this nexus 1000v",
 "message.action.disable.physical.network": "Please confirm that you want to disable this physical network.",
diff --git a/src/views/AutogenView.vue b/src/views/AutogenView.vue
index 114115d..0fb8ffb 100644
--- a/src/views/AutogenView.vue
+++ b/src/views/AutogenView.vue
@@ -28,7 +28,7 @@
                 shape="round"
                 size="small"
                 icon="reload"
-                @click="fetchData()">
+                @click="fetchData({ listall: true, irefresh: true })">
                 {{ $t('label.refresh') }}
               </a-button>
               <a-switch
@@ -80,7 +80,7 @@
     </a-card>
 
     <div v-show="showAction">
-      <keep-alive v-if="currentAction.component">
+      <keep-alive v-if="currentAction.component && (!currentAction.groupAction || this.selectedRowKeys.length === 0)">
         <a-modal
           :visible="showAction"
           :closable="true"
@@ -448,13 +448,19 @@ export default {
       }
 
       if (this.$route && this.$route.params && this.$route.params.id) {
-        this.resource = {}
         this.dataView = true
-        this.$emit('change-resource', this.resource)
+        if (!('irefresh' in params)) {
+          this.resource = {}
+          this.$emit('change-resource', this.resource)
+        }
       } else {
         this.dataView = false
       }
 
+      if ('irefresh' in params) {
+        delete params.irefresh
+      }
+
       if ('listview' in this.$refs && this.$refs.listview) {
         this.$refs.listview.resetSelection()
       }
diff --git a/src/views/compute/DestoryVM.vue b/src/views/compute/DestoryVM.vue
index b67668d..3b30b60 100644
--- a/src/views/compute/DestoryVM.vue
+++ b/src/views/compute/DestoryVM.vue
@@ -17,7 +17,7 @@
 
 <template>
   <div class="form-layout">
-    <p v-html="$t('message.action.destroy.instance')" />
+    <a-alert type="warning" v-html="$t('message.action.destroy.instance')" /><br/>
     <a-spin :spinning="loading">
       <a-form
         :form="form"