From ed72a1cbbdd35f0997bec4d2cf25d4a012ea79db Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Tue, 31 Mar 2026 16:48:52 +0200
Subject: ✨ sheet: json fields - "no data" is not always displayed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 archaeological_finds/templates/ishtar/sheet_find.html        | 2 ++
 archaeological_finds/templates/ishtar/sheet_museum_find.html | 2 ++
 ishtar_common/templates/ishtar/blocks/sheet_json.html        | 8 ++++----
 ishtar_common/templatetags/window_field.py                   | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index 8b23000ed..0ae238d66 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -319,7 +319,9 @@
   {% if item.data and item.data|length > 0 %}
   <div class="tab-pane fade" id="{{window_id}}-json"
        role="tabpanel" aria-labelledby="{{window_id}}-json-tab">
+      {% with json_show_no_data=True %}
       {% include "ishtar/blocks/sheet_json.html" %}
+      {% endwith %}
   </div>
   {% endif %}
 </div>
diff --git a/archaeological_finds/templates/ishtar/sheet_museum_find.html b/archaeological_finds/templates/ishtar/sheet_museum_find.html
index 502d8cc5c..3acec990e 100644
--- a/archaeological_finds/templates/ishtar/sheet_museum_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_museum_find.html
@@ -319,7 +319,9 @@
   {% if item.data and item.data|length > 0 %}
   <div class="tab-pane fade" id="{{window_id}}-json"
        role="tabpanel" aria-labelledby="{{window_id}}-json-tab">
+      {% with json_show_no_data=True %}
       {% include "ishtar/blocks/sheet_json.html" %}
+      {% endwith %}
   </div>
   {% endif %}
 </div>
diff --git a/ishtar_common/templates/ishtar/blocks/sheet_json.html b/ishtar_common/templates/ishtar/blocks/sheet_json.html
index cbfc8813a..40a2db0aa 100644
--- a/ishtar_common/templates/ishtar/blocks/sheet_json.html
+++ b/ishtar_common/templates/ishtar/blocks/sheet_json.html
@@ -6,12 +6,12 @@
     {% field_flex label value %}
 {% if forloop.last %}</div>{% endif %}
 {% empty %}
-<div class='row'>
+{% if json_show_no_data %}<div class='row'>
     <div class="col-12"><em>{% trans "No data" %}</em></div>
-</div>
+</div>{% endif %}
 {% endfor %}
 {% empty %}
-<div class='row'>
+{% if json_show_no_data %}<div class='row'>
     <div class="col-12"><em>{% trans "No data" %}</em></div>
-</div>
+</div>{% endif %}
 {% endfor %}
diff --git a/ishtar_common/templatetags/window_field.py b/ishtar_common/templatetags/window_field.py
index 721f39ef5..12f4a59a6 100644
--- a/ishtar_common/templatetags/window_field.py
+++ b/ishtar_common/templatetags/window_field.py
@@ -5,7 +5,7 @@ from django.template import loader
 from django.utils.translation import gettext as _
 from django.utils.safestring import mark_safe
 
-from ishtar_common.models import HistoryModel, Town
+from ishtar_common.models import HistoryModel
 from ishtar_common.templatetags.link_to_window import link_to_window
 
 register = template.Library()
-- 
cgit v1.2.3