diff options
4 files changed, 10 insertions, 5 deletions
diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html index d26996705..2dd58d49c 100644 --- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html +++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html @@ -131,10 +131,7 @@ {% if item.archaeological_site %} <h3>{% trans SITE_LABEL %}</h3> <div class='row'> - {% field_flex "Reference" item.archaeological_site.reference %} - {% field_flex "Name" item.archaeological_site.name %} - {% field_flex_multiple "Periods" item.archaeological_site.periods %} - {% field_flex_multiple "Remains" item.archaeological_site.remains %} + {% field_flex_detail SITE_LABEL item.archaeological_site %} {% field_flex_full "Towns" item.archaeological_site.towns_codes|join:" ; " %} </div> {% endif %} diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 34e3c4f87..7a23cfb86 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -634,6 +634,8 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, ImageModel, 'label__icontains', 'base_finds__context_record': 'base_finds__context_record__pk', + 'base_finds__context_record__archaeological_site': + 'base_finds__context_record__archaeological_site__pk', 'base_finds__context_record__parcel__town': 'base_finds__context_record__parcel__town__pk', 'base_finds__context_record__operation__year': diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 0acf97167..79d581c6d 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -209,6 +209,7 @@ {% field_flex "Town" base_find.context_record.parcel.town %} {% field_flex "Parcel" base_find.context_record.parcel %} {% field_flex_detail "Operation" base_find.context_record.operation %} + {% field_flex_detail "Archaeological site" base_find.context_record.archaeological_site %} {% field_flex "Point of topographic reference" base_find.topographic_localisation %} {% if base_find.x or base_find.y %} diff --git a/archaeological_operations/templates/ishtar/sheet_site.html b/archaeological_operations/templates/ishtar/sheet_site.html index ec00480d9..86ae666f4 100644 --- a/archaeological_operations/templates/ishtar/sheet_site.html +++ b/archaeological_operations/templates/ishtar/sheet_site.html @@ -55,4 +55,9 @@ {% if item.operations.count %} {% dynamic_table_document operations 'operations' 'archaeological_sites' item.pk '' output %} {% endif %} -{% endblock %}
\ No newline at end of file + +{% trans "Finds" as finds %} +{% dynamic_table_document finds 'finds' 'base_finds__context_record__archaeological_site' item.pk '' output %} + +context_records +{% endblock %} |