diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-04-03 17:30:58 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-04-03 17:30:58 +0200 |
| commit | 95c2cf33370ac73cfab6963d54d2a5bc8728d7a8 (patch) | |
| tree | a9d415d60bb689c6af40c4427d40c9ca8177f3ca /archaeological_context_records | |
| parent | 4f4ea768d9d72b96bcf826c525ed1b066191b11b (diff) | |
| parent | c50c0e4e5701b9926fbdad82b4ae54964a9283bb (diff) | |
| download | Ishtar-95c2cf33370ac73cfab6963d54d2a5bc8728d7a8.tar.bz2 Ishtar-95c2cf33370ac73cfab6963d54d2a5bc8728d7a8.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_context_records')
| -rw-r--r-- | archaeological_context_records/locale/django.pot | 4 | ||||
| -rw-r--r-- | archaeological_context_records/templates/ishtar/sheet_contextrecord.html | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/archaeological_context_records/locale/django.pot b/archaeological_context_records/locale/django.pot index 8a74c7110..e01054c0d 100644 --- a/archaeological_context_records/locale/django.pot +++ b/archaeological_context_records/locale/django.pot @@ -590,11 +590,11 @@ msgstr "" msgid "Document from this context record" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:129 +#: templates/ishtar/sheet_contextrecord.html:131 msgid "Finds" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:134 +#: templates/ishtar/sheet_contextrecord.html:136 msgid "Documents from associated finds" msgstr "" diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html index f7296848b..ecd80e36f 100644 --- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html +++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html @@ -124,14 +124,18 @@ {% endif %} {% trans "Document from this context record" as cr_docs %} -{% if item.source.count %} {% table_document cr_docs item.source.all %}{% endif %} +{% if item.source.count %} +{% dynamic_table_document cr_docs 'context_records_docs' 'context_record' item.pk '' output %} +{% endif %} {% trans "Finds" as finds %} {% if item.base_finds.count %} {% dynamic_table_document finds 'finds_for_ope' 'base_finds__context_record' item.pk 'TABLE_COLS_FOR_OPE' output %} {% endif %} -{% trans "Documents from associated finds" as find_docs %} -{% if item.find_docs_q.count %} {% table_document find_docs item.find_docs_q.all %}{% endif %} +{% trans "Documents from associated finds" as finds_docs %} +{% if item.find_docs_q.count %} +{% dynamic_table_document finds_docs 'finds_docs' 'find__base_finds__context_record' item.pk '' output %} +{% endif %} {% endblock %} |