From f3b8b251b55b8e5e57f6f3553f303dc1de40e121 Mon Sep 17 00:00:00 2001
From: catborise <catborise@yahoo.com>
Date: Wed, 31 Jul 2019 09:59:44 +0300
Subject: [PATCH] Instance actions rearranged to reflect disable vm actions on
 instances list

---
 .../templates/allinstances_index_grouped.html |  22 ++--
 .../allinstances_index_nongrouped.html        | 117 +++++++++---------
 instances/templates/instances.html            |  22 ++--
 instances/views.py                            |   6 +
 4 files changed, 87 insertions(+), 80 deletions(-)

diff --git a/instances/templates/allinstances_index_grouped.html b/instances/templates/allinstances_index_grouped.html
index 0035e43..209610f 100644
--- a/instances/templates/allinstances_index_grouped.html
+++ b/instances/templates/allinstances_index_grouped.html
@@ -71,16 +71,16 @@
                                     <span class="glyphicon glyphicon-play"></span>
                                 </button>
                             {% endif %}
-                            <button class="btn btn-sm btn-default disabled" title="{% trans "Suspend" %}">
+                            <button class="btn btn-sm btn-default disabled" title="{% trans "Suspend" %}" disabled>
                                 <span class="glyphicon glyphicon-pause"></span>
                             </button>
-                            <button class="btn btn-sm btn-default disabled" title="{% trans "Power Off" %}">
+                            <button class="btn btn-sm btn-default disabled" title="{% trans "Power Off" %}" disabled>
                                 <span class="glyphicon glyphicon-off"></span>
                             </button>
-                            <button class="btn btn-sm btn-default disabled" title="{% trans "Power Cycle" %}">
+                            <button class="btn btn-sm btn-default disabled" title="{% trans "Power Cycle" %}" disabled>
                                 <span class="glyphicon glyphicon-refresh"></span>
                             </button>
-                            <button class="btn btn-sm btn-default disabled" title="{% trans "VNC Console" %}">
+                            <button class="btn btn-sm btn-default disabled" title="{% trans "VNC Console" %}" disabled>
                                 <span class="glyphicon glyphicon-eye-open"></span>
                             </button>
                         {% endifequal %}
@@ -88,21 +88,21 @@
                             <button class="btn btn-sm btn-default" type="submit" name="resume" title="{% trans "Resume" %}">
                                 <span class="glyphicon glyphicon-play"></span>
                             </button>
-                            <button class="btn btn-sm btn-default disabled" title="{% trans "Suspend" %}">
+                            <button class="btn btn-sm btn-default disabled" title="{% trans "Suspend" %}" disabled>
                                 <span class="glyphicon glyphicon-pause"></span>
                             </button>
-                            <button class="btn btn-sm btn-default disabled" title="{% trans "Power Off" %}">
+                            <button class="btn btn-sm btn-default" type="submit" name="powerforce" title="{% trans "Force Off" %}" onclick="return confirm('Are you sure to force it down?')">
                                 <span class="glyphicon glyphicon-off"></span>
                             </button>
-                            <button class="btn btn-sm btn-default disabled" title="{% trans "Power Cycle" %}">
+                            <button class="btn btn-sm btn-default disabled" title="{% trans "Power Cycle" %}" disabled>
                                 <span class="glyphicon glyphicon-refresh"></span>
                             </button>
-                            <button class="btn btn-sm btn-default disabled" title="{% trans "VNC Console" %}">
+                            <button class="btn btn-sm btn-default disabled" title="{% trans "VNC Console" %}" disabled>
                                 <span class="glyphicon glyphicon-eye-open"></span>
                             </button>
                         {% endifequal %}
                         {% ifequal info.status 1 %}
-                            <button class="btn btn-sm btn-default disabled" title="{% trans "Power On" %}">
+                            <button class="btn btn-sm btn-default disabled" title="{% trans "Power On" %}" disabled>
                                 <span class="glyphicon glyphicon-play"></span>
                             </button>
                             <button class="btn btn-sm btn-default" type="submit" name="suspend" title="{% trans "Suspend" %}">
@@ -114,9 +114,9 @@
                             <button class="btn btn-sm btn-default" type="submit" name="powercycle" title="{% trans "Power Cycle" %}" onclick="return confirm('Are you sure?')">
                                 <span class="glyphicon glyphicon-refresh"></span>
                             </button>
-                            <a href="#" class="btn btn-sm btn-default" onclick='open_console("{{ host.0 }}-{{ info.uuid }}")' title="{% trans "Console" %}">
+                            <button class="btn btn-sm btn-default" type="button" onclick='open_console("{{ host.0 }}-{{ info.uuid }}")' title="{% trans "Console" %}">
                                 <span class="glyphicon glyphicon-eye-open"></span>
-                            </a>
+                            </button>
                         {% endifequal %}
                     </form>
                 </td>
diff --git a/instances/templates/allinstances_index_nongrouped.html b/instances/templates/allinstances_index_nongrouped.html
index 6d04286..dc98ed5 100644
--- a/instances/templates/allinstances_index_nongrouped.html
+++ b/instances/templates/allinstances_index_nongrouped.html
@@ -23,67 +23,68 @@
                 </td>
                 <td>{{ info.vcpu }}</td>
                 <td>{{ info.memory|filesizeformat }}</td>
-                <td><form action="" method="post" role="form">{% csrf_token %}
-                    <input type="hidden" name="name" value="{{ vm }}"/>
-                    <input type="hidden" name="compute_id" value="{{ host.0 }}"/>
-                    {% ifequal info.status 5 %}
-                        {% if info.is_template %}
-                            <button class="btn btn-sm btn-default" type="button" name="clone" title="{% trans "Clone" %}" onclick="goto_instance_clone({{ host.0 }}, '{{ vm }}');">
-                                <span class="glyphicon glyphicon-duplicate"></span>
+                <td>
+                    <form action="" method="post" role="form">{% csrf_token %}
+                        <input type="hidden" name="name" value="{{ vm }}"/>
+                        <input type="hidden" name="compute_id" value="{{ host.0 }}"/>
+                        {% ifequal info.status 5 %}
+                            {% if info.is_template %}
+                                <button class="btn btn-sm btn-default" type="button" name="clone" title="{% trans "Clone" %}" onclick="goto_instance_clone({{ host.0 }}, '{{ vm }}');">
+                                    <span class="glyphicon glyphicon-duplicate"></span>
+                                </button>
+                            {% else %}
+                                <button class="btn btn-sm btn-default" type="submit" name="poweron" title="{% trans "Power On" %}">
+                                    <span class="glyphicon glyphicon-play"></span>
+                                </button>
+                            {% endif %}
+                            <button class="btn btn-sm btn-default disabled" title="{% trans "Suspend" %}" disabled>
+                                <span class="glyphicon glyphicon-pause"></span>
                             </button>
-                        {% else %}
-                            <button class="btn btn-sm btn-default" type="submit" name="poweron" title="{% trans "Power On" %}">
+                            <button class="btn btn-sm btn-default disabled" title="{% trans "Power Off" %}" disabled>
+                                <span class="glyphicon glyphicon-off"></span>
+                            </button>
+                            <button class="btn btn-sm btn-default disabled" title="{% trans "Power Cycle" %}" disabled>
+                                <span class="glyphicon glyphicon-refresh"></span>
+                            </button>
+                            <button class="btn btn-sm btn-default disabled" title="{% trans "VNC Console" %}" disabled>
+                                <span class="glyphicon glyphicon-eye-open"></span>
+                            </button>
+                        {% endifequal %}
+                        {% ifequal info.status 3 %}
+                            <button class="btn btn-sm btn-default" type="submit" name="resume" title="{% trans "Resume" %}">
                                 <span class="glyphicon glyphicon-play"></span>
                             </button>
-                        {% endif %}
-                        <button class="btn btn-sm btn-default disabled" title="{% trans "Suspend" %}">
-                            <span class="glyphicon glyphicon-pause"></span>
-                        </button>
-                        <button class="btn btn-sm btn-default disabled" title="{% trans "Power Off" %}">
-                            <span class="glyphicon glyphicon-off"></span>
-                        </button>
-                        <button class="btn btn-sm btn-default disabled" title="{% trans "Power Cycle" %}">
-                            <span class="glyphicon glyphicon-refresh"></span>
-                        </button>
-                        <button class="btn btn-sm btn-default disabled" title="{% trans "VNC Console" %}">
-                            <span class="glyphicon glyphicon-eye-open"></span>
-                        </button>
-                    {% endifequal %}
-                    {% ifequal info.status 3 %}
-                        <button class="btn btn-sm btn-default" type="submit" name="resume" title="{% trans "Resume" %}">
-                            <span class="glyphicon glyphicon-play"></span>
-                        </button>
-                        <button class="btn btn-sm btn-default disabled" title="{% trans "Suspend" %}">
-                            <span class="glyphicon glyphicon-pause"></span>
-                        </button>
-                        <button class="btn btn-sm btn-default disabled" title="{% trans "Power Off" %}">
-                            <span class="glyphicon glyphicon-off"></span>
-                        </button>
-                        <button class="btn btn-sm btn-default disabled" title="{% trans "Power Cycle" %}">
-                            <span class="glyphicon glyphicon-refresh"></span>
-                        </button>
-                        <button class="btn btn-sm btn-default disabled" title="{% trans "VNC Console" %}">
-                            <span class="glyphicon glyphicon-eye-open"></span>
-                        </button>
-                    {% endifequal %}
-                    {% ifequal info.status 1 %}
-                        <button class="btn btn-sm btn-default disabled" title="{% trans "Power On" %}">
-                            <span class="glyphicon glyphicon-play"></span>
-                        </button>
-                        <button class="btn btn-sm btn-default" type="submit" name="suspend" title="{% trans "Suspend" %}">
-                            <span class="glyphicon glyphicon-pause"></span>
-                        </button>
-                        <button class="btn btn-sm btn-default" type="submit" name="poweroff" title="{% trans "Power Off" %}" onclick="return confirm('Are you sure?')">
-                            <span class="glyphicon glyphicon-off"></span>
-                        </button>
-                        <button class="btn btn-sm btn-default" type="submit" name="powercycle" title="{% trans "Power Cycle" %}" onclick="return confirm('Are you sure?')">
-                            <span class="glyphicon glyphicon-refresh"></span>
-                        </button>
-                        <a href="#" class="btn btn-sm btn-default" onclick='open_console("{{ host.0 }}-{{ info.uuid }}")' title="{% trans "Console" %}">
-                            <span class="glyphicon glyphicon-eye-open"></span>
-                        </a>
-                    {% endifequal %}
-                </form>
+                            <button class="btn btn-sm btn-default disabled" title="{% trans "Suspend" %}" disabled>
+                                <span class="glyphicon glyphicon-pause"></span>
+                            </button>
+                            <button class="btn btn-sm btn-default" type="submit" name="powerforce" title="{% trans "Force Off" %}" onclick="return confirm('Are you sure to force it down?')">
+                                <span class="glyphicon glyphicon-off"></span>
+                            </button>
+                            <button class="btn btn-sm btn-default disabled" title="{% trans "Power Cycle" %}" disabled>
+                                <span class="glyphicon glyphicon-refresh"></span>
+                            </button>
+                            <button class="btn btn-sm btn-default disabled" title="{% trans "VNC Console" %}" disabled>
+                                <span class="glyphicon glyphicon-eye-open"></span>
+                            </button>
+                        {% endifequal %}
+                        {% ifequal info.status 1 %}
+                            <button class="btn btn-sm btn-default disabled" title="{% trans "Power On" %}" disabled>
+                                <span class="glyphicon glyphicon-play"></span>
+                            </button>
+                            <button class="btn btn-sm btn-default" type="submit" name="suspend" title="{% trans "Suspend" %}">
+                                <span class="glyphicon glyphicon-pause"></span>
+                            </button>
+                            <button class="btn btn-sm btn-default" type="submit" name="poweroff" title="{% trans "Power Off" %}" onclick="return confirm('Are you sure?')">
+                                <span class="glyphicon glyphicon-off"></span>
+                            </button>
+                            <button class="btn btn-sm btn-default" type="submit" name="powercycle" title="{% trans "Power Cycle" %}" onclick="return confirm('Are you sure?')">
+                                <span class="glyphicon glyphicon-refresh"></span>
+                            </button>
+                            <button class="btn btn-sm btn-default" type="button" onclick='open_console("{{ host.0 }}-{{ info.uuid }}")' title="{% trans "Console" %}">
+                                <span class="glyphicon glyphicon-eye-open"></span>
+                            </button>
+                        {% endifequal %}
+                    </form>
                 </td>
             </tr>
         {% endfor %}
diff --git a/instances/templates/instances.html b/instances/templates/instances.html
index 2383178..33e0b72 100644
--- a/instances/templates/instances.html
+++ b/instances/templates/instances.html
@@ -100,16 +100,16 @@
                                                         <span class="glyphicon glyphicon-play"></span>
                                                     </button>
                                                 {% endif %}
-                                                <button class="btn btn-sm btn-default disabled" title="{% trans "Suspend" %}">
+                                                <button class="btn btn-sm btn-default disabled" title="{% trans "Suspend" %}" disabled>
                                                     <span class="glyphicon glyphicon-pause"></span>
                                                 </button>
-                                                <button class="btn btn-sm btn-default disabled" title="{% trans "Power Off" %}">
+                                                <button class="btn btn-sm btn-default disabled" title="{% trans "Power Off" %}" disabled>
                                                     <span class="glyphicon glyphicon-off"></span>
                                                 </button>
-                                                <button class="btn btn-sm btn-default disabled" title="{% trans "Power Cycle" %}">
+                                                <button class="btn btn-sm btn-default disabled" title="{% trans "Power Cycle" %}" disabled>
                                                     <span class="glyphicon glyphicon-refresh"></span>
                                                 </button>
-                                                <button class="btn btn-sm btn-default disabled" title="{% trans "VNC Console" %}">
+                                                <button class="btn btn-sm btn-default disabled" title="{% trans "VNC Console" %}" disabled>
                                                     <span class="glyphicon glyphicon-eye-open"></span>
                                                 </button>
                                             {% endifequal %}
@@ -117,21 +117,21 @@
                                                 <button class="btn btn-sm btn-default" type="submit" name="resume" title="{% trans "Resume" %}">
                                                     <span class="glyphicon glyphicon-play"></span>
                                                 </button>
-                                                <button class="btn btn-sm btn-default disabled" title="{% trans "Suspend" %}">
+                                                <button class="btn btn-sm btn-default disabled" title="{% trans "Suspend" %}" disabled>
                                                     <span class="glyphicon glyphicon-pause"></span>
                                                 </button>
-                                                <button class="btn btn-sm btn-default disabled" title="{% trans "Power Off" %}">
+                                                <button class="btn btn-sm btn-default" type="submit" name="powerforce" title="{% trans "Force Off" %}" onclick="return confirm('Are you sure to force it down?')">
                                                     <span class="glyphicon glyphicon-off"></span>
                                                 </button>
-                                                <button class="btn btn-sm btn-default disabled" title="{% trans "Power Cycle" %}">
+                                                <button class="btn btn-sm btn-default disabled" title="{% trans "Power Cycle" %}" disabled>
                                                     <span class="glyphicon glyphicon-refresh"></span>
                                                 </button>
-                                                <button class="btn btn-sm btn-default disabled" title="{% trans "VNC Console" %}">
+                                                <button class="btn btn-sm btn-default disabled" title="{% trans "VNC Console" %}" disabled>
                                                     <span class="glyphicon glyphicon-eye-open"></span>
                                                 </button>
                                             {% endifequal %}
                                             {% ifequal info.status 1 %}
-                                                <button class="btn btn-sm btn-default disabled" title="{% trans "Power On" %}">
+                                                <button class="btn btn-sm btn-default disabled" title="{% trans "Power On" %}" disabled>
                                                     <span class="glyphicon glyphicon-play"></span>
                                                 </button>
                                                 <button class="btn btn-sm btn-default" type="submit" name="suspend" title="{% trans "Suspend" %}">
@@ -143,9 +143,9 @@
                                                 <button class="btn btn-sm btn-default" type="submit" name="powercycle" title="{% trans "Power Cycle" %}" onclick="return confirm('Are you sure?')">
                                                     <span class="glyphicon glyphicon-refresh"></span>
                                                 </button>
-                                                <a href="#" class="btn btn-sm btn-default" onclick='open_console("{{ host.0 }}-{{ info.uuid }}")' title="{% trans "Console" %}">
+                                                <button class="btn btn-sm btn-default" type="button" onclick='open_console("{{ host.0 }}-{{ info.uuid }}")' title="{% trans "Console" %}">
                                                     <span class="glyphicon glyphicon-eye-open"></span>
-                                                </a>
+                                                </button>
                                             {% endifequal %}
                                         </form>
                                         </td>
diff --git a/instances/views.py b/instances/views.py
index c1ae1a4..b0ecaba 100644
--- a/instances/views.py
+++ b/instances/views.py
@@ -988,6 +988,12 @@ def instances_actions(request):
         conn.shutdown(name)
         return HttpResponseRedirect(request.get_full_path())
 
+    if 'powerforce' in request.POST:
+        conn.force_shutdown()
+        msg = _("Force Off")
+        addlogmsg(request.user.username, instance.name, msg)
+        return HttpResponseRedirect(request.get_full_path())
+
     if 'powercycle' in request.POST:
         msg = _("Power Cycle")
         conn.force_shutdown(name)