From 16aa1615cfdfdf96104b8654bb7caa463a5c95e0 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 9 Sep 2022 12:35:47 +0200 Subject: Fix safe_or template tags --- ishtar_common/templatetags/ishtar_helpers.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ishtar_common/templatetags/ishtar_helpers.py b/ishtar_common/templatetags/ishtar_helpers.py index 29ed57b08..0ed114757 100644 --- a/ishtar_common/templatetags/ishtar_helpers.py +++ b/ishtar_common/templatetags/ishtar_helpers.py @@ -21,8 +21,8 @@ def and_(value1, value2): def safe_or(item, args): if not item: return False + result = False for arg in args.split("|"): - result = True current_item = item for sub in arg.split("."): if isinstance(current_item, dict): @@ -35,8 +35,11 @@ def safe_or(item, args): result = False break current_item = getattr(current_item, sub) + if callable(current_item): + result = current_item() if result: return True + return False @register.filter -- cgit v1.2.3