4 files changed, 16 insertions, 7 deletions
diff --git a/ishtar_common/templates/ishtar/blocks/window_field.html b/ishtar_common/templates/ishtar/blocks/window_field.html
new file mode 100644
index 000000000..9b2bc6540
--- /dev/null
+++ b/ishtar_common/templates/ishtar/blocks/window_field.html
@@ -0,0 +1,3 @@
+{% load i18n %}
+{% if data %}<p><label>{% trans caption %}{% trans ":"%}</label>
+<span class='value'>{{data}}</span></p>{% endif%}
diff --git a/ishtar_common/templatetags/window_field.py b/ishtar_common/templatetags/window_field.py
new file mode 100644
index 000000000..90cb5391c
--- /dev/null
+++ b/ishtar_common/templatetags/window_field.py
@@ -0,0 +1,8 @@
+from django import template
+
+register = template.Library()
+
+
+@register.inclusion_tag('ishtar/blocks/window_field.html')
+def field(caption, data):
+    return {'caption': caption, 'data': data}
diff --git a/ishtar_common/templatetags/window_tables.py b/ishtar_common/templatetags/window_tables.py
index 5c19eb6df..5eebf6359 100644
--- a/ishtar_common/templatetags/window_tables.py
+++ b/ishtar_common/templatetags/window_tables.py
@@ -1,12 +1,8 @@
-
 from django import template
-from django.utils.translation import ugettext as _
-import re
 
 register = template.Library()
 
+
 @register.inclusion_tag('ishtar/blocks/window_tables/documents.html')
 def table_document(caption, data):
-    return {'caption':caption, 'data':data}
-
-
+    return {'caption': caption, 'data': data}
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index c9211c219..4f089d258 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -146,7 +146,9 @@ def get_autocomplete_generic(model, extra={'available': True}):
             query = query & Q(label__icontains=q)
         limit = 20
         objects = model.objects.filter(query)[:limit]
-        data = json.dumps([{'id': obj.pk, 'value': unicode(obj)}
+        get_label = lambda x: x.full_label() if hasattr(x, 'full_label') \
+                                             else unicode(x)
+        data = json.dumps([{'id': obj.pk, 'value': get_label(obj)}
                            for obj in objects])
         return HttpResponse(data, mimetype='text/plain')
     return func