summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2021-09-09 17:33:12 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2022-12-12 12:20:58 +0100
commitf2f735ed86dd12c37ded45eb0b191b02582c3d08 (patch)
tree93df91b512ec977fb4edbace3606624e73a0c2f0 /ishtar_common
parent16512652b69b7b14a6f0ff76a95b990763f37f15 (diff)
downloadIshtar-f2f735ed86dd12c37ded45eb0b191b02582c3d08.tar.bz2
Ishtar-f2f735ed86dd12c37ded45eb0b191b02582c3d08.zip
Migration to Django 2.2 - fixes
- fix historized object display
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/templatetags/window_field.py5
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')