From a930c0a56b2cba4799e9caf76375b23f366feaf6 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 2 Oct 2020 11:57:31 +0200 Subject: Container: warning message about associated finds, containers on deletion --- .../ishtar/wizard/wizard_file_deletion.html | 2 +- .../ishtar/wizard/wizard_container_deletion.html | 58 ++++++++++++++++++++++ archaeological_warehouse/wizards.py | 3 ++ .../templates/ishtar/wizard/delete_wizard.html | 26 ++++++---- .../wizard/wizard_organization_deletion.html | 2 +- .../ishtar/wizard/wizard_person_deletion.html | 2 +- 6 files changed, 79 insertions(+), 14 deletions(-) create mode 100644 archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html diff --git a/archaeological_files/templates/ishtar/wizard/wizard_file_deletion.html b/archaeological_files/templates/ishtar/wizard/wizard_file_deletion.html index a29436e1d..d45747e4e 100644 --- a/archaeological_files/templates/ishtar/wizard/wizard_file_deletion.html +++ b/archaeological_files/templates/ishtar/wizard/wizard_file_deletion.html @@ -1,6 +1,6 @@ {% extends "ishtar/wizard/delete_wizard.html" %} {% load i18n %} -{% block "detailled_extra_info" %} +{% block "detailed_extra_info" %} {% if current_object.operations.count %}

{% trans "Associated operations" %}

diff --git a/archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html b/archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html new file mode 100644 index 000000000..ea11652af --- /dev/null +++ b/archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html @@ -0,0 +1,58 @@ +{% extends "ishtar/wizard/delete_wizard.html" %} +{% load i18n %} +{% block "detailed_related_info" %} + +{% if current_object.children.count %} +
+
+ {% trans "Associated containers" %} +
+
+
+
+ {% trans "Theses containers are inside this item. If you delete this item, they won't have any parent container. You probably want to fix that." %} +
+
+
    + {% for container in current_object.children.all %} +
  • {{container}}
  • {% endfor %} +
+
+
+{% endif %} +{% if current_object.finds.count or current_object.finds_ref.count %} +
+
+ {% trans "Associated finds" %} +
+
+ {% if current_object.finds.count %} +
+
+ {% trans "Theses finds are inside this item. If you delete this item, they won't be inside any container. You probably want to fix that." %} +
+
+
    + {% for find in current_object.finds.all %} +
  • {{find}}
  • {% endfor %} +
+ {% endif %} + {% if current_object.finds_ref.count %} +
+
+ {% trans "This item is the reference container for theses finds. If you delete this item, they won't have any reference container. You probably want to fix that." %} +
+
+
    + {% for find in current_object.finds_ref.all %} +
  • {{find}}
  • {% endfor %} +
+ {% endif %} +
+
+{% endif %} + +{% endblock %} diff --git a/archaeological_warehouse/wizards.py b/archaeological_warehouse/wizards.py index 9bce9381b..614e6e6be 100644 --- a/archaeological_warehouse/wizards.py +++ b/archaeological_warehouse/wizards.py @@ -179,3 +179,6 @@ class ContainerDeletionWizard(MultipleDeletionWizard): fields = ['container_type', 'reference', 'comment', 'location', 'index', 'cached_label'] redirect_url = "container_deletion" + wizard_templates = { + 'final-container_deletion': + 'ishtar/wizard/wizard_container_deletion.html'} diff --git a/ishtar_common/templates/ishtar/wizard/delete_wizard.html b/ishtar_common/templates/ishtar/wizard/delete_wizard.html index 21c5f31b5..3a3d5ab1d 100644 --- a/ishtar_common/templates/ishtar/wizard/delete_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/delete_wizard.html @@ -3,15 +3,15 @@ {% load range %} {% block "warning_message" %}
-

- {% if current_objs and current_objs.1 %} - {% trans "Are you sure to want to delete theses items?" %} -

- {% else %} - {% trans "Are you sure to want to delete this item?" %}{% endif %} -

+
+ {% if current_objs and current_objs.1 %} + {% trans "Are you sure to want to delete theses items?" %} +
    {% for obj in current_objs %} +
  • {{obj}}
  • + {% endfor %}
+ {% else %} + {% trans "Are you sure to want to delete this item?" %}{% endif %} +

{% trans "No rollback is possible. Be careful to scroll to the end of page to check every piece of information." %}

{% endblock %} @@ -26,7 +26,7 @@ {% endif %}
{% for current_object in current_objs %}{% if forloop.counter == forloop.parentloop.counter %} - {% block "detailled_extra_info" %} + {% block "detailed_extra_info" %} {% endblock %} {% endif %}{% endfor %} @@ -34,9 +34,13 @@ {% endfor %}
{{data.0}}{{data.1}}
-
+{% for current_object in current_objs %}{% if forloop.counter == forloop.parentloop.counter %} +{% block "detailed_related_info" %} +{% endblock %} +{% endif %}{% endfor %} + {% endfor %} {% endblock "cards" %} diff --git a/ishtar_common/templates/ishtar/wizard/wizard_organization_deletion.html b/ishtar_common/templates/ishtar/wizard/wizard_organization_deletion.html index bd45ab5e8..ba99042d9 100644 --- a/ishtar_common/templates/ishtar/wizard/wizard_organization_deletion.html +++ b/ishtar_common/templates/ishtar/wizard/wizard_organization_deletion.html @@ -1,6 +1,6 @@ {% extends "ishtar/wizard/delete_wizard.html" %} {% load i18n %} -{% block "detailled_extra_info" %} +{% block "detailed_extra_info" %} {% if current_object.members.count %}

{% trans "Associated persons" %}

diff --git a/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html b/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html index 27595286b..d078aeba3 100644 --- a/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html +++ b/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html @@ -1,6 +1,6 @@ {% extends "ishtar/wizard/delete_wizard.html" %} {% load i18n %} -{% block "detailled_extra_info" %} +{% block "detailed_extra_info" %} {% if current_object.file_responsability.count %}

{% trans "In charge of archaeological files" %}

-- cgit v1.2.3