diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2026-03-31 16:48:52 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2026-04-01 10:58:30 +0200 |
| commit | 1e2c6c872a49890657b21f4e313e303f7715c2b8 (patch) | |
| tree | 6827cd34e05f67b6db2e3cba11a4718dc2378d03 | |
| parent | 276d8b268485f75a49a7f2a2e09c6cd64173dc6c (diff) | |
| download | Ishtar-1e2c6c872a49890657b21f4e313e303f7715c2b8.tar.bz2 Ishtar-1e2c6c872a49890657b21f4e313e303f7715c2b8.zip | |
✨ sheet: json fields - "no data" is not always displayed
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() |