From be00b1cf8ef4638aaa34490c5a153052ccb868b2 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Thu, 8 Oct 2026 08:32:10 +0300
Subject: [PATCH] fix(instances): a paused VM can be destroyed from its page

The Destroy button was disabled and the confirmation page refused a
paused VM ("Instance is suspended, cannot destroy!"), while the destroy
request itself stops a paused VM like a running one. Both now offer it.
---
 .../instances/destroy_instance_form.html      | 42 ++++++++-----------
 .../templates/instances/destroy_tab.html      |  6 +--
 instances/test_destroy.py                     |  6 +++
 instances/test_page_controls.py               |  5 +++
 4 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/instances/templates/instances/destroy_instance_form.html b/instances/templates/instances/destroy_instance_form.html
index 5420fd17..0594c5ba 100644
--- a/instances/templates/instances/destroy_instance_form.html
+++ b/instances/templates/instances/destroy_instance_form.html
@@ -10,32 +10,26 @@
 
 {% block content %}
 {% if can_delete %}
-    {% if instance.status == 3 %}
-        <div class="alert alert-danger">
-            {% trans "Instance is suspended, cannot destroy!" %}
+    <div class="alert alert-danger">
+        {% trans "This action is irreversible!" %}
+    </div>
+    <form action="{% url 'instances:destroy' instance.id %}" class="form" method="post" role="form" id="delete_form">{% csrf_token %}
+        <div class="form-check form-switch">
+            <input class="form-check-input" type="checkbox" name="delete_disk" value="true" checked id="delete_disk">
+            <label class="form-check-label fw-bold" for="delete_disk">{% trans "Remove Instance's data" %}</label>
         </div>
-    {% else %}
-        <div class="alert alert-danger">
-            {% trans "This action is irreversible!" %}
+        {% if instance.nvram %}    
+        <div class="form-check form-switch">
+            <input class="form-check-input" type="checkbox" name="delete_nvram" value="true" id="delete_nvram" checked>
+            <label class="form-check-label fw-bold" for="delete_nvram">
+                {% trans "Remove Instance's NVRAM" %}
+            </label>
         </div>
-        <form action="{% url 'instances:destroy' instance.id %}" class="form" method="post" role="form" id="delete_form">{% csrf_token %}
-            <div class="form-check form-switch">
-                <input class="form-check-input" type="checkbox" name="delete_disk" value="true" checked id="delete_disk">
-                <label class="form-check-label fw-bold" for="delete_disk">{% trans "Remove Instance's data" %}</label>
-            </div>
-            {% if instance.nvram %}    
-            <div class="form-check form-switch">
-                <input class="form-check-input" type="checkbox" name="delete_nvram" value="true" id="delete_nvram" checked>
-                <label class="form-check-label fw-bold" for="delete_nvram">
-                    {% trans "Remove Instance's NVRAM" %}
-                </label>
-            </div>
-            {% endif %}
-            <button type="submit" class="btn btn-lg btn-success float-end" name="delete">
-                {% trans "Destroy" %}
-            </button>
-        </form>
-    {% endif %}
+        {% endif %}
+        <button type="submit" class="btn btn-lg btn-success float-end" name="delete">
+            {% trans "Destroy" %}
+        </button>
+    </form>
 {% else %}
     <div class="alert alert-danger" role="alert">
         {% trans "You cannot destroy instance!" %}
diff --git a/instances/templates/instances/destroy_tab.html b/instances/templates/instances/destroy_tab.html
index a788c6b3..32bf78ac 100644
--- a/instances/templates/instances/destroy_tab.html
+++ b/instances/templates/instances/destroy_tab.html
@@ -13,11 +13,7 @@
         <div role="tabpanel" class="tab-pane tab-pane-bordered active" id="destroy">
             <p>{% trans 'This action starts remove instance process' %}</p>
             {% if can_delete %}
-                {% if instance.status == 3 %}
-                    <a class="btn btn-lg btn-success disabled float-end">{% trans "Destroy" %}</a>
-                {% else %}
-                    <a href="{% url 'instances:destroy' instance.id %}" class="btn btn-lg btn-success float-end">{% trans "Destroy" %}</a>
-                {% endif %}
+                <a href="{% url 'instances:destroy' instance.id %}" class="btn btn-lg btn-success float-end">{% trans "Destroy" %}</a>
             {% else %}
                 <button class="btn btn-lg btn-success disabled float-end" name="delete">{% trans "Destroy" %}</button>
             {% endif %}
diff --git a/instances/test_destroy.py b/instances/test_destroy.py
index f50c3f3f..4ba4c429 100644
--- a/instances/test_destroy.py
+++ b/instances/test_destroy.py
@@ -65,3 +65,9 @@ class DestroyOrderTestCase(TestCase):
             response = self.client.get(reverse("instances:destroy", args=[self.instance.id]))
         self.assertEqual(response.status_code, 200)
         self.assertEqual(calls, [])
+
+    def test_the_confirmation_page_of_a_paused_vm_offers_the_form(self):
+        with patch("instances.models.wvmInstance") as wvm:
+            wvm.return_value.get_status.return_value = 3  # paused
+            response = self.client.get(reverse("instances:destroy", args=[self.instance.id]))
+        self.assertIn('id="delete_form"', response.content.decode())
diff --git a/instances/test_page_controls.py b/instances/test_page_controls.py
index 3bf87540..699043e2 100644
--- a/instances/test_page_controls.py
+++ b/instances/test_page_controls.py
@@ -145,6 +145,11 @@ class PageControlsTestCase(PageControls, TestCase):
                             owner={"is_change": True})
         self.assertEqual(self.controls(changer), CONSOLE | POWER | CHANGE | {"clone", "snapshots"})
 
+    def test_a_paused_vm_can_be_destroyed(self):
+        # destroy stops a paused VM like a running one
+        owner = self.user("paused_deleter", owner={"is_delete": True})
+        self.assertIn("destroy", self.controls(owner, status=3))
+
     def test_owner_with_change_and_no_extra_permissions(self):
         changer = self.user("ctl_plain_changer", owner={"is_change": True})
         self.assertEqual(self.controls(changer), CONSOLE | POWER | CHANGE)