From 7e9ed74db88639bdb35e371b159bd682ec84ad66 Mon Sep 17 00:00:00 2001
From: Ihor Sokhan <isokhan@exoft.net>
Date: Mon, 30 Jun 2025 16:38:26 +0300
Subject: [PATCH 1/2] fixed template

---
 admin/templates/nodes/registration_force_archive_form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/templates/nodes/registration_force_archive_form.html b/admin/templates/nodes/registration_force_archive_form.html
index ab52d7f7c33..b675fae3d86 100644
--- a/admin/templates/nodes/registration_force_archive_form.html
+++ b/admin/templates/nodes/registration_force_archive_form.html
@@ -19,7 +19,7 @@ <h4>Handle collision:</h4>
             <h4>Permissible Addons (Optional):</h4>
             <div>
                 <div>
-                    {% for addon_name in node.get_addon_names %}
+                    {% for addon_name in node.registered_from.get_addon_names %}
                     <input class="form-check-input" type="checkbox" name="addons" id="permissibleAddon" value="{{ addon_name }}">
                     <label class="form-check-label" for="permissibleAddon">{{ addon_name }}</label>
                     {% endfor %}

From 38f8da4f1b1388034d394c59502b5b5a182f5461 Mon Sep 17 00:00:00 2001
From: Ihor Sokhan <isokhan@exoft.net>
Date: Mon, 30 Jun 2025 16:55:17 +0300
Subject: [PATCH 2/2] fetch registration addons without admin's intervention

---
 admin/nodes/views.py                                  |  6 +++---
 .../nodes/registration_force_archive_form.html        | 11 -----------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/admin/nodes/views.py b/admin/nodes/views.py
index 40cf261945d..41a22ff38c5 100644
--- a/admin/nodes/views.py
+++ b/admin/nodes/views.py
@@ -761,7 +761,7 @@ def post(self, request, *args, **kwargs):
 
         allow_unconfigured = force_archive_params.get('allow_unconfigured', False)
 
-        addons = set(force_archive_params.getlist('addons', []))
+        addons = set(registration.registered_from.get_addon_names())
         addons.update(DEFAULT_PERMISSIBLE_ADDONS)
 
         try:
@@ -780,8 +780,8 @@ def post(self, request, *args, **kwargs):
                     registration,
                     permissible_addons=addons,
                     allow_unconfigured=allow_unconfigured,
-                    skip_collision=skip_collision,
-                    delete_collision=delete_collision,
+                    skip_collisions=skip_collision,
+                    delete_collisions=delete_collision,
                 )
                 messages.success(request, 'Registration archive process has finished.')
             except Exception as exc:
diff --git a/admin/templates/nodes/registration_force_archive_form.html b/admin/templates/nodes/registration_force_archive_form.html
index b675fae3d86..32331fa7a54 100644
--- a/admin/templates/nodes/registration_force_archive_form.html
+++ b/admin/templates/nodes/registration_force_archive_form.html
@@ -15,17 +15,6 @@ <h4>Handle collision:</h4>
                 </div>
             </div>
         </div>
-        <div>
-            <h4>Permissible Addons (Optional):</h4>
-            <div>
-                <div>
-                    {% for addon_name in node.registered_from.get_addon_names %}
-                    <input class="form-check-input" type="checkbox" name="addons" id="permissibleAddon" value="{{ addon_name }}">
-                    <label class="form-check-label" for="permissibleAddon">{{ addon_name }}</label>
-                    {% endfor %}
-                </div>
-            </div>
-        </div>
         <div>
             <h4>Other:</h4>
             <div>