From 226f744bae4307c6b4fd984614340430d1a61d69 Mon Sep 17 00:00:00 2001
From: Arvind Tiwari <tiwariav@gmail.com>
Date: Mon, 18 Sep 2017 21:52:59 +0530
Subject: [PATCH] success modal added

---
 .../hosting/js/virtual_machine_detail.js      |  2 +-
 .../hosting/virtual_machine_detail.html       | 19 ++++++++++++++++++-
 hosting/views.py                              | 12 ++++++++----
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/hosting/static/hosting/js/virtual_machine_detail.js b/hosting/static/hosting/js/virtual_machine_detail.js
index d6387dbc..711b486b 100644
--- a/hosting/static/hosting/js/virtual_machine_detail.js
+++ b/hosting/static/hosting/js/virtual_machine_detail.js
@@ -27,7 +27,7 @@ function VMTerminateSuccess($container, data) {
     $container.addClass('terminate-success')
         .find('.vm-item-lg').text(data.text);
     $container.find('.btn').remove();
-    window.location = data.redirect;
+    $('#terminate-success').modal('show');
 }
 
 function VMTerminateFail($container, data, text) {
diff --git a/hosting/templates/hosting/virtual_machine_detail.html b/hosting/templates/hosting/virtual_machine_detail.html
index d0bfae47..9d77c31d 100644
--- a/hosting/templates/hosting/virtual_machine_detail.html
+++ b/hosting/templates/hosting/virtual_machine_detail.html
@@ -103,7 +103,7 @@
 				</div>
 	            <div class="modal-body">
 					<div class="modal-icon"><i class="fa fa-ban" aria-hidden="true"></i></div>
-					<h4 class="modal-title" id="ModalLabel">{% trans "Terminate your Virtual Machine"%}</h4>
+					<h4 class="modal-title" id="ModalLabel">{% trans "Terminate your Virtual Machine" %}</h4>
 					<div class="modal-text">
 						<p>{% trans "Do you want to cancel your Virtual Machine" %} ?</p>
 						<p><strong>{{virtual_machine.name}}</strong></p>
@@ -116,4 +116,21 @@
 	    </div>
 	</div>
 	<!-- / Cancel Modal -->
+	<!-- Success Modal -->
+	<div class="modal fade" id="terminate-success" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog">
+      <div class="modal-content">
+				<div class="modal-header">
+				</div>
+        <div class="modal-body">
+					<div class="modal-icon"><i class="fa fa-ban" aria-hidden="true"></i></div>
+					<h4 class="modal-title" id="ModalLabel">{% trans "Your Virtual Machine" %} {{vm.id}} {% trans "was successfully terminated!" %}</h4>
+          <div class="modal-footer">
+            <a href="{% url 'hosting:virtual_machines' %}"	class="btn btn-danger btn-wide">{% trans "Close" %}</a>
+          </div>
+        </div>
+      </div>
+    </div>
+	</div>
+	<!-- / Cancel Modal -->
 {%endblock%}
diff --git a/hosting/views.py b/hosting/views.py
index acd7e67b..8356d5ad 100644
--- a/hosting/views.py
+++ b/hosting/views.py
@@ -961,7 +961,13 @@ class VirtualMachineView(LoginRequiredMixin, View):
             password=owner.password
         )
 
-        vm_data = VirtualMachineSerializer(manager.get_vm(vm.id)).data
+        try:
+            vm_data = VirtualMachineSerializer(manager.get_vm(vm.id)).data
+        except BaseException:
+            return redirect(
+                reverse('hosting:virtual_machines',
+                        kwargs={'pk': opennebula_vm_id})
+            )
 
         terminated = manager.delete_vm(vm.id)
 
@@ -971,12 +977,10 @@ class VirtualMachineView(LoginRequiredMixin, View):
         else:
             for t in range(15):
                 try:
-                    manager.get_vm(self.kwargs.get('pk'))
+                    manager.get_vm(opennebula_vm_id)
                 except WrongIdError:
                     response['status'] = True
-                    response['redirect'] = self.get_success_url()
                     response['text'] = ugettext('Terminated')
-                    self.send_mail()
                     break
                 except BaseException:
                     break