From 7b22e70da44e3d725d3830a937dd58ef0b4a742e Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 13 Mar 2017 12:16:20 +0100 Subject: Imports: add a name (refs #3452) --- ishtar_common/templates/ishtar/import_delete.html | 33 ++++++++++++----------- ishtar_common/templates/ishtar/import_list.html | 6 ++++- 2 files changed, 22 insertions(+), 17 deletions(-) (limited to 'ishtar_common/templates') diff --git a/ishtar_common/templates/ishtar/import_delete.html b/ishtar_common/templates/ishtar/import_delete.html index 30217bf8d..4b48ebc8c 100644 --- a/ishtar_common/templates/ishtar/import_delete.html +++ b/ishtar_common/templates/ishtar/import_delete.html @@ -4,21 +4,22 @@ {% block content %}

{{page_name}}

-
{% csrf_token %} -

{% trans "The current items are linked to this import:" %}

-{% for accessor, imported in object.get_all_imported %} -{% ifchanged imported|verbose_model_name %} -{% if forloop.counter %}{% endif %} -

{{imported|verbose_model_name}}

-
    -{%endifchanged%} -
  • {{imported}}
  • -{% endfor %} -
-

{% trans "All these items will be deleted with this import." %}

-{% trans "Are you sure?" %} - -
-

{% trans "Back" %}

+

{{object}}

+
{% csrf_token %} +

{% trans "The current items are linked to this import:" %}

+ {% for accessor, imported in object.get_all_imported %} + {% ifchanged imported|verbose_model_name %} + {% if forloop.counter %}{% endif %} +

{{imported|verbose_model_name}}

+
    + {%endifchanged%} +
  • {{imported}}
  • + {% endfor %} +
+

{% trans "All these items will be deleted with this import." %}

+ {% trans "Are you sure?" %} + +
+

{% trans "Back" %}

{% endblock %} diff --git a/ishtar_common/templates/ishtar/import_list.html b/ishtar_common/templates/ishtar/import_list.html index 55a4ea883..a33786f6b 100644 --- a/ishtar_common/templates/ishtar/import_list.html +++ b/ishtar_common/templates/ishtar/import_list.html @@ -8,8 +8,9 @@

{% trans "No pending imports." %}

{% else %}
{% csrf_token %} - +
+ @@ -18,6 +19,9 @@ {% for import in object_list %} + -- cgit v1.2.3
{% trans "Name" %} {% trans "Type" %} {% trans "File" context "file" %} {% trans "Creation" %}
+ {{import.name|default:"-"}} + {{import.importer_type}}