Administrative act: add a warning when associated item is deleted (refs #4554)

7 files changed, 24 insertions, 5 deletions

diff --git a/CHANGES.md b/CHANGES.md
index 3c344e1ab..20dd86081 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -41,6 +41,7 @@ Ishtar changelog
 - File: filter plan action when preventive_operator is activated in profile 
 - Profile: do not display geo item list when mapping is deactivated
 - Explicit message on associated container deletion when a warehouse is deleted
+- Administrative act: add a warning when associated item is deleted
 - Sheet:
   - fix treatment and file treatment sheet display (bad QR code link)
   - Operation - statistics number of parcels fix
diff --git a/archaeological_files/templates/ishtar/wizard/wizard_file_deletion.html b/archaeological_files/templates/ishtar/wizard/wizard_file_deletion.html
index d45747e4e..a7df431b2 100644
--- a/archaeological_files/templates/ishtar/wizard/wizard_file_deletion.html
+++ b/archaeological_files/templates/ishtar/wizard/wizard_file_deletion.html
@@ -1,14 +1,12 @@
-{% extends "ishtar/wizard/delete_wizard.html" %}
+{% extends "ishtar/wizard/wizard_delete_associated_to_admin_act.html" %}
 {% load i18n %}
 {% block "detailed_extra_info" %}
-
 {% if current_object.operations.count %}
 <h3>{% trans "Associated operations" %}</h3>
 <ul class='list'>
 {% for item in current_object.operations.all %}
-  <li>{{person}} <a class='display_details_inline' href="#"
+  <li>{{item}} <a class='display_details_inline' href="#"
                     onclick='load_window("{% url "show-operation" item.pk "" %}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></li>{% endfor %}
 </ul>
 {% endif %}
-
 {% endblock %}
diff --git a/archaeological_files/wizards.py b/archaeological_files/wizards.py
index 569b01a56..b89023877 100644
--- a/archaeological_files/wizards.py
+++ b/archaeological_files/wizards.py
@@ -182,6 +182,7 @@ FILE_FIELDS = [
     "address_complement",
     "postal_code",
     "comment",
+    "administrative_act",
 ]
 
 
diff --git a/archaeological_finds/wizards.py b/archaeological_finds/wizards.py
index 0465792b7..5bf321baf 100644
--- a/archaeological_finds/wizards.py
+++ b/archaeological_finds/wizards.py
@@ -481,8 +481,13 @@ class TreatmentDeletionWizard(DeletionWizard):
         "start_date",
         "end_date",
         "container",
+        "administrative_act",
     ]
     redirect_url = "treatment_deletion"
+    wizard_templates = {
+        "final-treatment_deletion":
+            "ishtar/wizard/wizard_delete_associated_to_admin_act.html"
+    }
 
 
 class TreatmentAdministrativeActWizard(OperationAdministrativeActWizard):
@@ -531,8 +536,13 @@ class TreatmentFileDeletionWizard(MultipleDeletionWizard):
         "creation_date",
         "end_date",
         "comment",
+        "administrative_act",
     ]
     redirect_url = "treatmentfile_deletion"
+    wizard_templates = {
+        "final-treatmentfile_deletion":
+            "ishtar/wizard/wizard_delete_associated_to_admin_act.html"
+    }
 
 
 class TreatmentFileAdministrativeActWizard(OperationAdministrativeActWizard):
diff --git a/archaeological_operations/wizards.py b/archaeological_operations/wizards.py
index 918226e96..402219e41 100644
--- a/archaeological_operations/wizards.py
+++ b/archaeological_operations/wizards.py
@@ -217,6 +217,7 @@ class OperationClosingWizard(ClosingWizard):
         "comment",
         "towns",
         "remains",
+        "administrative_act",
     ]
 
 
@@ -225,6 +226,10 @@ class OperationDeletionWizard(MultipleDeletionWizard):
     fields = OperationClosingWizard.fields
     filter_owns = {"selec-operation_deletion": ["pks"]}
     redirect_url = "operation_deletion"
+    wizard_templates = {
+        "final-operation_deletion":
+            "ishtar/wizard/wizard_delete_associated_to_admin_act.html"
+    }
 
 
 class OperationAdministrativeActWizard(OperationWizard):
diff --git a/ishtar_common/templates/ishtar/wizard/wizard_delete_associated_to_admin_act.html b/ishtar_common/templates/ishtar/wizard/wizard_delete_associated_to_admin_act.html
new file mode 100644
index 000000000..c1284b94d
--- /dev/null
+++ b/ishtar_common/templates/ishtar/wizard/wizard_delete_associated_to_admin_act.html
@@ -0,0 +1,5 @@
+{% extends "ishtar/wizard/delete_wizard.html" %}
+{% load i18n %}
+{% block "extra_warning" %}
+<p><strong>{% trans "If any, all administrative act listed above will be deleted." %}</strong></p>
+{% endblock %}
diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py
index aa3ef68ab..c2383e2de 100644
--- a/ishtar_common/wizards.py
+++ b/ishtar_common/wizards.py
@@ -1944,7 +1944,6 @@ class IshtarUserDeletionWizard(MultipleDeletionWizard):
 
     def get_formated_datas(self, forms):
         datas = super(IshtarUserDeletionWizard, self).get_formated_datas(forms)
-        print(self.current_objs, datas)
         for idx, values in enumerate(datas):
             obj = self.current_objs[idx]
             datas[idx][1].append((_("Username"), obj.user_ptr.username))