From a935871722f530f0ac08e2b658cf58315db5df0e Mon Sep 17 00:00:00 2001
From: Arvind Tiwari <tiwariav@gmail.com>
Date: Fri, 15 Sep 2017 00:57:59 +0530
Subject: [PATCH] code reformating

---
 .../hosting/js/virtual_machine_detail.js      | 96 +++++++++----------
 hosting/views.py                              | 28 ++----
 2 files changed, 56 insertions(+), 68 deletions(-)

diff --git a/hosting/static/hosting/js/virtual_machine_detail.js b/hosting/static/hosting/js/virtual_machine_detail.js
index 076ec344..898ecbaa 100644
--- a/hosting/static/hosting/js/virtual_machine_detail.js
+++ b/hosting/static/hosting/js/virtual_machine_detail.js
@@ -1,54 +1,52 @@
+$(document).ready(function() {
 
-$( document ).ready(function() {
+    $('#confirm-cancel').on('click', '.btn-ok', function(e) {
+        var url = $('#virtual_machine_cancel_form').attr('action');
+        var $container = $('#terminate-VM');
+        var $btn = $container.find('.btn');
+        var text = $container.find('.vm-item-lg').text();
+        var altText = $container.attr('data-alt');
+        $container.find('.alert-danger').addClass('hide');
+        $container.addClass('processing')
+            .find('.vm-item-lg').attr('class', '')
+            .addClass('vm-item-lg vm-color-failed')
+            .text(altText);
+        $btn.prop('disabled', true);
+        $('#confirm-cancel').modal('hide');
+        $.post(url)
+            .done(function(data) {
+                console.log("success", data);
+                if (data.status == true) {
+                    $container.addClass('terminate-success')
+                        .find('.vm-item-lg').text(data.text);
+                    $btn.remove();
+                    window.location = data.redirect;
+                } else {
+                    $container.addClass('terminate-fail')
+                        .find('.vm-item-lg').text(text);
+                    $container.find('.btn').prop('disabled', false);
+                    $container.find('.alert-danger').text(data.text).removeClass('hide');
+                }
+            })
+            .fail(function(data) {
+                $container.addClass('terminate-fail')
+                    .find('.vm-item-lg').text(text);
+                $container.find('.btn').prop('disabled', false);
+                $container.find('.alert-danger').removeClass('hide');
+            })
+            .always(function(data) {
+                $container.removeClass('processing');
+            });
+    });
 
-	$('#confirm-cancel').on('click', '.btn-ok', function(e) {
-    var url = $('#virtual_machine_cancel_form').attr('action');
-    var $container = $('#terminate-VM');
-    var $btn = $container.find('.btn');
-    var text = $container.find('.vm-item-lg').text();
-    var altText = $container.attr('data-alt');
-    $container.find('.alert-danger').addClass('hide');
-    $container.addClass('processing')
-      .find('.vm-item-lg').attr('class', '')
-      .addClass('vm-item-lg vm-color-failed')
-      .text(altText);
-    $btn.prop('disabled', true);
-    $('#confirm-cancel').modal('hide');
-    $.post(url)
-      .done(function(data) {
-        console.log( "success" , data);
-        if (data.status == true) {
-          $container.addClass('terminate-success')
-            .find('.vm-item-lg').text(data.text);
-          $btn.remove();
-          window.location = data.redirect;
-        }
-        else {
-          $container.addClass('terminate-fail')
-            .find('.vm-item-lg').text(text);
-          $container.find('.btn').prop('disabled', false);
-          $container.find('.alert-danger').text(data.text).removeClass('hide');
-        }
-      })
-      .fail(function(data) {
-        $container.addClass('terminate-fail')
-          .find('.vm-item-lg').text(text);
-        $container.find('.btn').prop('disabled', false);
-        $container.find('.alert-danger').removeClass('hide');
-      })
-      .always(function(data) {
-        $container.removeClass('processing');
-      });
-	});
+    var hash = window.location.hash;
+    hash && $('ul.nav a[href="' + hash + '"]').tab('show');
 
-  var hash = window.location.hash;
-  hash && $('ul.nav a[href="' + hash + '"]').tab('show');
-
-  $('.nav-tabs a').click(function (e) {
-    $(this).tab('show');
-    var scrollmem = $('body').scrollTop() || $('html').scrollTop();
-    window.location.hash = this.hash;
-    $('html,body').scrollTop(scrollmem);
-  });
+    $('.nav-tabs a').click(function(e) {
+        $(this).tab('show');
+        var scrollmem = $('body').scrollTop() || $('html').scrollTop();
+        window.location.hash = this.hash;
+        $('html,body').scrollTop(scrollmem);
+    });
 
 });
\ No newline at end of file
diff --git a/hosting/views.py b/hosting/views.py
index ed85dbdb..f25d6567 100644
--- a/hosting/views.py
+++ b/hosting/views.py
@@ -957,6 +957,14 @@ class VirtualMachineView(LoginRequiredMixin, View):
             response['text'] = ugettext(
                 'Error terminating VM') + opennebula_vm_id
         else:
+            for t in range(150):
+                try:
+                    manager.get_vm(self.kwargs.get('pk'))
+                except BaseException:
+                    break
+                else:
+                    sleep(2)
+
             context = {
                 'vm': vm_data,
                 'base_url': "{0}://{1}".format(self.request.scheme,
@@ -973,28 +981,10 @@ class VirtualMachineView(LoginRequiredMixin, View):
             }
             email = BaseEmail(**email_data)
             email.send()
-
-            # messages.error(
-            #     request,
-            #     _('VM %(VM_ID)s terminated successfully') % {
-            #         'VM_ID': opennebula_vm_id}
-            # )
-            t = 0
-            while True:
-                if t < 150:
-                    t += 1
-                    try:
-                        manager.get_vm(self.kwargs.get('pk'))
-                    except BaseException:
-                        break
-                    else:
-                        sleep(2)
-                else:
-                    break
-
             response['status'] = True
             response['redirect'] = self.get_success_url()
             response['text'] = ugettext('Terminated')
+
         return HttpResponse(
             json.dumps(response),
             content_type="application/json"