diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2023-03-06 18:51:32 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2023-03-06 18:53:38 +0100 |
| commit | c1b0fc6772ac8b8d8c9923b93c595a1d5f9558fc (patch) | |
| tree | 7bb1ac3fa57668c33b7a12b38cf5a72128ee06de | |
| parent | c9554219672696378cd11591fed769d5a08ffc77 (diff) | |
| download | Ishtar-c1b0fc6772ac8b8d8c9923b93c595a1d5f9558fc.tar.bz2 Ishtar-c1b0fc6772ac8b8d8c9923b93c595a1d5f9558fc.zip | |
Explicit message on associated container deletion when a warehouse is deleted (refs #4552)
| -rw-r--r-- | CHANGES.md | 1 | ||||
| -rw-r--r-- | archaeological_warehouse/templates/ishtar/wizard/wizard_warehouse_deletion.html | 5 | ||||
| -rw-r--r-- | archaeological_warehouse/wizards.py | 4 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/wizard/delete_wizard.html | 1 |
4 files changed, 11 insertions, 0 deletions
diff --git a/CHANGES.md b/CHANGES.md index a904e5167..3c344e1ab 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -40,6 +40,7 @@ Ishtar changelog - Find form: remove TAQ/TPQ check - 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 - Sheet: - fix treatment and file treatment sheet display (bad QR code link) - Operation - statistics number of parcels fix diff --git a/archaeological_warehouse/templates/ishtar/wizard/wizard_warehouse_deletion.html b/archaeological_warehouse/templates/ishtar/wizard/wizard_warehouse_deletion.html new file mode 100644 index 000000000..4929cbf43 --- /dev/null +++ b/archaeological_warehouse/templates/ishtar/wizard/wizard_warehouse_deletion.html @@ -0,0 +1,5 @@ +{% extends "ishtar/wizard/delete_wizard.html" %} +{% load i18n %} +{% block "extra_warning" %} +<p><strong>{% trans "All containers listed above will be deleted." %}</strong></p> +{% endblock %} diff --git a/archaeological_warehouse/wizards.py b/archaeological_warehouse/wizards.py index 66da94b86..0c6f7c951 100644 --- a/archaeological_warehouse/wizards.py +++ b/archaeological_warehouse/wizards.py @@ -107,6 +107,10 @@ class WarehouseModificationWizard(Wizard): class WarehouseDeletionWizard(MultipleDeletionWizard): model = models.Warehouse redirect_url = "warehouse_deletion" + fields = ["name", "warehouse_type", "containers"] + wizard_templates = { + "final-warehouse_deletion": "ishtar/wizard/wizard_warehouse_deletion.html" + } class ContainerWizard(Wizard): diff --git a/ishtar_common/templates/ishtar/wizard/delete_wizard.html b/ishtar_common/templates/ishtar/wizard/delete_wizard.html index 625b7a823..abf3ec603 100644 --- a/ishtar_common/templates/ishtar/wizard/delete_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/delete_wizard.html @@ -13,6 +13,7 @@ {% trans "Are you sure to want to delete this item?" %}{% endif %} </div> <p>{% trans "No rollback is possible. Be careful to scroll to the end of page to check every piece of information." %}</p> + {% block "extra_warning" %}{% endblock %} </div> {% endblock %} |