From 4a7cb33fade4403fc2fe37bc061d2bcdbd928394 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 19 Nov 2019 23:04:00 +0100 Subject: Fix display history for operation --- .../templates/ishtar/sheet_operation.html | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'archaeological_operations') diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 1e7d3dc78..9153454fd 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -20,14 +20,16 @@ {% with permission_view_own_container=permission_view_own_container %} {% with display_data=item.data %} -{% with display_relations=item.right_relations.count|or_:item.left_relations.count %} -{% with display_sites=item.archaeological_sites.count|or_:item.grouped_parcels|or_:item.administrative_act.count %} +{% with display_relations=item|safe_or:"right_relations.count|left_relations.count" %} +{% with display_sites=item|safe_or:"archaeological_sites.count|grouped_parcels|administrative_act.count" %} {% with perm_documents=permission_view_own_document|or_:permission_view_document %} {% with display_documents=perm_documents|and_:item.documents.count %} {% with perm_context_records=permission_view_own_contextrecord|or_:permission_view_contextrecord %} -{% with display_context_records=perm_context_records|and_:item.context_record.count %} +{% with has_context_records=item|safe_or:"context_record.count" %} +{% with display_context_records=perm_context_records|and_:has_context_records %} {% with perm_find=permission_view_own_find|or_:permission_view_find %} -{% with display_finds=perm_find|and_:item.has_finds %} +{% with has_finds=item|safe_or:"has_finds" %} +{% with display_finds=perm_find|and_:has_finds %} {% if output != "ODT" and output != "PDF"%}