From 60684cc7b13c01ccfee30c5ec4376aac342631d5 Mon Sep 17 00:00:00 2001
From: catborise <catborise@yahoo.com>
Date: Wed, 20 Nov 2019 11:41:50 +0300
Subject: [PATCH] Live resize VM Memory activate. Redirection fix for resizing
 operations. Some typo & indent fix

---
 instances/templates/instance.html | 13 ++++---------
 instances/views.py                |  8 ++++----
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/instances/templates/instance.html b/instances/templates/instance.html
index a05d76d..471901a 100644
--- a/instances/templates/instance.html
+++ b/instances/templates/instance.html
@@ -432,11 +432,7 @@
                                                 <small><input type="checkbox" class="js-custom__checkbox" /> {% trans "Custom value" %}</small>
                                             </div>
                                         </div>
-                                        {% ifequal status 5 %}
-                                            <button type="submit" class="btn btn-lg btn-success pull-right" name="resizevm_mem">{% trans "Resize" %}</button>
-                                        {% else %}
-                                            <button class="btn btn-lg btn-success pull-right disabled">{% trans "Resize" %}</button>
-                                        {% endifequal %}
+                                        <button type="submit" class="btn btn-lg btn-success pull-right" name="resizevm_mem">{% trans "Resize" %}</button>
                                     </form>
                                 {% else %}
                                     {% trans "You don't have permission for resizing instance" %}
@@ -951,8 +947,8 @@
                                     </thead>
                                     <tbody>
                                     {% for q, attrs in qos.items %}
-                                            {% for att in attrs  %}
-                                                <form method="post" role="form">{% csrf_token %}
+                                        {% for att in attrs  %}
+                                            <form method="post" role="form">{% csrf_token %}
                                             <tr>
                                                 <td><label class="control-label">{{ q }} {{ att.direction | capfirst }}</label></td>
                                                 <td><input id="qos_average" class="form-control" name="qos_average"
@@ -976,9 +972,8 @@
                                                     </button>
                                                 </td>
                                             </tr>
-                                                </form>
+                                            </form>
                                             {% endfor %}
-
                                     {% endfor %}
                                     </tbody>
                                 </table>
diff --git a/instances/views.py b/instances/views.py
index 9049dff..ae1e189 100644
--- a/instances/views.py
+++ b/instances/views.py
@@ -481,7 +481,7 @@ def instance(request, compute_id, vname):
                     conn.resize_cpu(cur_vcpu, vcpu)
                     msg = _("Resize CPU")
                     addlogmsg(request.user.username, instance.name, msg)
-                    return HttpResponseRedirect(request.get_full_path() + '#resize')
+                return HttpResponseRedirect(request.get_full_path() + '#resize')
 
             if 'resizevm_mem' in request.POST and (request.user.is_superuser or
                                                    request.user.is_staff or
@@ -504,7 +504,7 @@ def instance(request, compute_id, vname):
                     conn.resize_mem(cur_memory, memory)
                     msg = _("Resize Memory")
                     addlogmsg(request.user.username, instance.name, msg)
-                    return HttpResponseRedirect(request.get_full_path() + '#resize')
+                return HttpResponseRedirect(request.get_full_path() + '#resize')
 
             if 'resizevm_disk' in request.POST and (
                     request.user.is_superuser or request.user.is_staff or userinstance.is_change):
@@ -524,7 +524,7 @@ def instance(request, compute_id, vname):
                     conn.resize_disk(disks_new)
                     msg = _("Resize")
                     addlogmsg(request.user.username, instance.name, msg)
-                    return HttpResponseRedirect(request.get_full_path() + '#resize')
+                return HttpResponseRedirect(request.get_full_path() + '#resize')
 
             if 'add_new_vol' in request.POST and allow_admin_or_not_template:
                 conn_create = wvmCreate(compute.hostname,
@@ -1052,7 +1052,7 @@ def get_host_instances(request, comp):
 
         conn.close()
     else:
-        raise libvirtError("Problem occured with {} - {}".format(comp.name, status))
+        raise libvirtError("Problem occurred with {} - {}".format(comp.name, status))
     return all_host_vms