Migration to Django 2.2 - fixes

- fix historized object display

1 files changed, 3 insertions, 2 deletions

diff --git a/ishtar_common/templatetags/window_field.py b/ishtar_common/templatetags/window_field.py
index 0e6b4e0d6..47256aea2 100644
--- a/ishtar_common/templatetags/window_field.py
+++ b/ishtar_common/templatetags/window_field.py
@@ -98,14 +98,15 @@ def field_multiple(caption, data, li=False, size=None):
 
 @register.simple_tag
 def field_multiple_obj(caption, item, attr, li=False, size=None):
-    data = getattr(item, attr)
+    data = getattr(item, attr) if hasattr(item, attr) else ""
     if not hasattr(item, '_step') or attr not in item.history_m2m \
             or not item.history_m2m[attr]:
         t = loader.get_template('ishtar/blocks/window_field_flex_multiple.html')
         return t.render(
             {'caption': caption, 'data': data, 'li': li, "size": size}
         )
-    rel_model = data.model
+    field = getattr(item.instance.__class__, attr)
+    rel_model = field.rel.model
     data = rel_model.history_decompress(item.history_m2m[attr])
     t = loader.get_template(
         'ishtar/blocks/window_field_flex_historized_multiple.html')