From 26ba00071ad1eb8b5bd3479290b6ffe02101298d Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 7 Jun 2024 16:53:06 +0200 Subject: 🐛 Sheet: harmonize creation/modification section (refs #4808) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/ishtar/sheet_administrativeact.html | 8 +++++++- archaeological_operations/templates/ishtar/sheet_site.html | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'archaeological_operations') diff --git a/archaeological_operations/templates/ishtar/sheet_administrativeact.html b/archaeological_operations/templates/ishtar/sheet_administrativeact.html index d952f66cb..61cc4a256 100644 --- a/archaeological_operations/templates/ishtar/sheet_administrativeact.html +++ b/archaeological_operations/templates/ishtar/sheet_administrativeact.html @@ -61,7 +61,6 @@ {% endif %} - {% field_flex_detail "Created by" item.history_creator.ishtaruser.person %} {% comment %}{% if item.general_contractor.attached_to %}

@@ -79,4 +78,11 @@ {% endif %} +{% if not is_external %} +

{% trans "Sheet"%}

+
+ {% include "ishtar/blocks/sheet_creation_section.html" %} +
+{% endif %} + {% endblock %} diff --git a/archaeological_operations/templates/ishtar/sheet_site.html b/archaeological_operations/templates/ishtar/sheet_site.html index 11717314b..6cc9a3454 100644 --- a/archaeological_operations/templates/ishtar/sheet_site.html +++ b/archaeological_operations/templates/ishtar/sheet_site.html @@ -46,7 +46,6 @@ {% field_flex_multiple_obj "Cultural attributions" item 'cultural_attributions' %} {% field_flex_multiple "Collaborators" item.collaborators %} {% field_flex_full "Comment" item.comment "
" "
" %} - {% include "ishtar/blocks/sheet_creation_section.html" %} {% if item.affmar_number or item.drassm_number or item.oceanographic_service_localisation or item.shipwreck_code or item.sinking_date or item.discovery_area or item.shipwreck_name %} @@ -105,5 +104,12 @@ {% with geo_item=item %}{% include "ishtar/blocks/sheet_geographic.html" %}{% endwith %} {% endif %} +{% if not is_external %} +

{% trans "Sheet"%}

+
+ {% include "ishtar/blocks/sheet_creation_section.html" %} +
+{% endif %} + {% endwith %} {% endwith %} {% endwith %} {% endblock %} -- cgit v1.2.3