Imports: better layout for deletion page

4 files changed, 25 insertions, 4 deletions

diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index fd0de385e..5384c160a 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -1776,7 +1776,11 @@ class Organization(Address, Merge, OwnPerms, ValueGetter):
         )
 
     def __unicode__(self):
-        return self.name
+        if self.name:
+            return self.name
+        return u"{} - {} - {}".format(self.organization_type,
+                                      self.address or "",
+                                      self.town or "")
 
     def generate_merge_key(self):
         self.merge_key = slugify(self.name if self.name else '')
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index babdae9f7..e82865e05 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -508,6 +508,10 @@ div.form {
     border:0;
 }
 
+.form .item-list{
+    text-align:left;
+}
+
 .help_text{
     display:none;
     font-size:0.9em;
diff --git a/ishtar_common/templates/ishtar/import_delete.html b/ishtar_common/templates/ishtar/import_delete.html
index 6979b4dd7..30217bf8d 100644
--- a/ishtar_common/templates/ishtar/import_delete.html
+++ b/ishtar_common/templates/ishtar/import_delete.html
@@ -6,9 +6,15 @@
 <div class='form'>
 <form action="." method="post">{% csrf_token %}
 <p>{% trans "The current items are linked to this import:" %}</p>
-<ul>{% for accessor, imported in object.get_all_imported %}
-    <li>{% get_verbose_model_name imported %}{% trans ":" %} {{imported}}</li>
-{% endfor %}</ul>
+{% for accessor, imported in object.get_all_imported %}
+{% ifchanged imported|verbose_model_name %}
+{% if forloop.counter %}</ul>{% endif %}
+<h4>{{imported|verbose_model_name}}</h4>
+<ul class='item-list'>
+{%endifchanged%}
+    <li>{{imported}}</li>
+{% endfor %}
+</ul>
 <p>{% trans "All these items will be deleted with this import." %}</p>
 <strong>{% trans "Are you sure?" %}</strong>
 <input type="submit" value="{% trans "Yes" %}"/>
diff --git a/ishtar_common/templatetags/verbose_names.py b/ishtar_common/templatetags/verbose_names.py
index 54b223977..771c76484 100644
--- a/ishtar_common/templatetags/verbose_names.py
+++ b/ishtar_common/templatetags/verbose_names.py
@@ -1,6 +1,7 @@
 from django import template
 register = template.Library()
 
+
 @register.simple_tag
 def get_verbose_field_name(instance, field_name):
     """
@@ -8,9 +9,15 @@ def get_verbose_field_name(instance, field_name):
     """
     return instance._meta.get_field(field_name).verbose_name.title()
 
+
 @register.simple_tag
 def get_verbose_model_name(instance):
     """
     Returns verbose_name for a model.
     """
     return instance._meta.verbose_name.title()
+
+
+@register.filter
+def verbose_model_name(instance):
+    return instance._meta.verbose_name.title()