From 3c3018d4eef1cfab657c2d6b8f8789f8b7bfcc71 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 --- .../templates/ishtar/wizard/delete_wizard.html | 26 +++++++++++++--------- .../wizard/wizard_organization_deletion.html | 2 +- .../ishtar/wizard/wizard_person_deletion.html | 2 +- 3 files changed, 17 insertions(+), 13 deletions(-) (limited to 'ishtar_common') 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