diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-18 12:58:54 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-18 12:58:54 +0200 |
| commit | e95afd17d217d41e91f7510ed0a9b2fd273b9fa5 (patch) | |
| tree | 56966dc6da586e2d2e067d95f71112a0534acce0 /archaeological_finds | |
| parent | 25e280824b2217b95ec755fa409a165992f546a9 (diff) | |
| download | Ishtar-e95afd17d217d41e91f7510ed0a9b2fd273b9fa5.tar.bz2 Ishtar-e95afd17d217d41e91f7510ed0a9b2fd273b9fa5.zip | |
Json fields: adapt main sheets to display dynamic json fields (refs #3077)
Diffstat (limited to 'archaeological_finds')
3 files changed, 6 insertions, 0 deletions
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index efd38e406..68304740d 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -58,6 +58,8 @@ {% field "Description" item.description "<pre>" "</pre>" %} {% field "Comment" item.comment "<pre>" "</pre>" %} +{% include "ishtar/blocks/sheet_json.html" %} + {% if item.conservatory_state or item.conservatory_comment or item.alterations.count or item.alteration_causes.count or item.preservation_to_considers.count or item.treatment_emergency or item.insurance_value %} <h4>{% trans "Preservation" %}</h4> <ul class='form-flex'> diff --git a/archaeological_finds/templates/ishtar/sheet_treatment.html b/archaeological_finds/templates/ishtar/sheet_treatment.html index 5fc8f2aac..94f6e20a7 100644 --- a/archaeological_finds/templates/ishtar/sheet_treatment.html +++ b/archaeological_finds/templates/ishtar/sheet_treatment.html @@ -42,6 +42,8 @@ {% field "Goal" item.goal "<pre>" "</pre>" %} {% endif %} +{% include "ishtar/blocks/sheet_json.html" %} + {% trans "Upstream finds" as finds %} {% if item.upstream.count %} {% dynamic_table_document finds 'finds_for_treatment' 'downstream_treatment' item.pk 'TABLE_COLS_FOR_OPE' output %} diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentfile.html b/archaeological_finds/templates/ishtar/sheet_treatmentfile.html index f8fb3e0aa..9567d3081 100644 --- a/archaeological_finds/templates/ishtar/sheet_treatmentfile.html +++ b/archaeological_finds/templates/ishtar/sheet_treatmentfile.html @@ -26,6 +26,8 @@ </ul> {% field "Comment" item.comment "<pre>" "</pre>" %} +{% include "ishtar/blocks/sheet_json.html" %} + {% if item.applicant %} <h3>{% trans "Applicant" %}</h3> <ul class='form-flex'> |