🩹 minor improvments on sheets - add getter for templates and index

1 files changed, 7 insertions, 6 deletions

diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
index 17f063fa3..aea498b8a 100644
--- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
+++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
@@ -1,7 +1,7 @@
 {% extends "ishtar/sheet.html" %}
 {% load i18n ishtar_helpers window_field window_header window_tables window_field %}
 
-{% block head_title %}<strong>{% trans "Context Record" %}</strong> - {{item.full_label}}{% endblock %}
+{% block head_title %}<strong>{% trans "Context Record" %}</strong> - {{item.cached_label}}{% endblock %}
 
 {% block toolbar %}
 {% window_nav item window_id 'show-contextrecord' 'record_modify' 'show-historized-contextrecord' 'revert-contextrecord' previous next 1 %}
@@ -122,16 +122,17 @@
             <div class="card float-left col-12 col-md-6 col-lg-4">
                 {% include "ishtar/blocks/window_image.html" %}
                 <div class="card-body">
-                    {% if item.complete_identifier %}<p class="window-refs"
-                            title="{% trans 'Complete identifier' %}">
-                    <strong>{{ item.complete_identifier }}</strong></p>{% endif %}
+                    <p class="window-refs"
+                            title="{% trans 'Identifier' %}">
+                    <strong>{{ item.cached_label }}</strong></p>
                     <p class='window-refs' title="{% trans 'Parcel' %}">{{ item.parcel.short_label }}</p>
-                    <p class="window-refs">{{ item.label|default:"" }}</p>
+                    {% if item.label != item.external_id %}
+                    <p class="window-refs">{{ item.label|default:"" }}</p>{% endif %}
                     {% include "ishtar/blocks/sheet_external_id.html" %}
                 </div>
             </div>
             <div class='row'>
-                {% field_flex_2 "Complete ID" item.full_label %}
+                {% if item.cached_label != item.complete_identifier %}{% field_flex_2 "Complete ID" item.complete_identifier %}{% endif %}
                 {% field_flex_2 "Type" item.unit %}
                 {% field_flex_detail _("Excavator") item.excavator %}
                 {% field_flex_full "General comment" item.comment "<pre>" "</pre>" has_image %}