From b64b199715c3f424762d54f848749ead11434096 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 18 Oct 2017 12:58:54 +0200 Subject: Json fields: adapt main sheets to display dynamic json fields (refs #3077) --- archaeological_warehouse/templates/ishtar/sheet_container.html | 2 ++ archaeological_warehouse/templates/ishtar/sheet_warehouse.html | 2 ++ 2 files changed, 4 insertions(+) (limited to 'archaeological_warehouse') diff --git a/archaeological_warehouse/templates/ishtar/sheet_container.html b/archaeological_warehouse/templates/ishtar/sheet_container.html index 7845da2c1..7c9f84a32 100644 --- a/archaeological_warehouse/templates/ishtar/sheet_container.html +++ b/archaeological_warehouse/templates/ishtar/sheet_container.html @@ -23,6 +23,8 @@ {% field "Location" item.precise_location %} {% field "Comment" item.comment "
" "
" %} +{% include "ishtar/blocks/sheet_json.html" %} + {% if item.finds.count %}

{% trans "Content" %}

{% dynamic_table_document finds 'finds' 'container' item.pk 'TABLE_COLS' output 'large' %} diff --git a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html index 3d39f9845..de93f9af3 100644 --- a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html +++ b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html @@ -17,6 +17,8 @@ {% include "ishtar/blocks/sheet_address_section.html" %} {% field "Comment" item.comment "
" "
" %} +{% include "ishtar/blocks/sheet_json.html" %} + {% if item.containers.count %}

{% trans "Containers" %}

{% dynamic_table_document '' 'containers' 'location' item.pk 'TABLE_COLS' output %} -- cgit v1.2.3