diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-11-19 23:13:44 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-11-19 23:13:44 +0100 |
commit | 4c65c716fde88bd3d89e243a7fddd68bede4a18f (patch) | |
tree | 4f4a8f0cdea58d3b2ec748e8291db304df753ba5 | |
parent | 2b9914d4bc04b7e41822ddb4cc49ed7fa95957f5 (diff) | |
download | Ishtar-4c65c716fde88bd3d89e243a7fddd68bede4a18f.tar.bz2 Ishtar-4c65c716fde88bd3d89e243a7fddd68bede4a18f.zip |
Fix display history for context records
-rw-r--r-- | archaeological_context_records/templates/ishtar/sheet_contextrecord.html | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html index 906571948..108f5ace5 100644 --- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html +++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html @@ -16,13 +16,15 @@ {% with permission_view_own_find=permission_view_own_find %} {% with can_view_documents=permission_view_own_document|or_:permission_view_document %} -{% with display_documents=can_view_documents|and_:item.documents.count %} -{% with display_relations=item.right_relations.count|or_:item.left_relations.count %} -{% with has_image=item.images.count %} +{% with has_documents=item|safe_or:"documents.count" %} +{% with display_documents=can_view_documents|and_:has_documents %} +{% with display_relations=item|safe_or:"right_relations.count|left_relations.count" %} +{% with has_image=item|safe_or:"images.count" %} {% with display_interpretation=item.activity|or_:item.identification|or_:item.interpretation|or_:item.filling %} {% with display_datations=item.taq|or_:item.taq_estimated|or_:item.tpq|or_:item.tpq_estimated %} {% with can_view_finds=permission_view_own_find|or_:permission_view_find %} -{% with display_finds=item.base_finds.count|and_:can_view_finds %} +{% with has_finds=item|safe_or:"base_finds.count" %} +{% with display_finds=has_finds|and_:can_view_finds %} {% with display_data=item.data %} {% if output != "ODT" and output != "PDF"%} @@ -317,6 +319,6 @@ {% endif %} </div> -{% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} +{% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endblock %} |