summaryrefslogtreecommitdiff
path: root/ishtar_common/templates
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2024-09-30 11:30:55 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2024-09-30 11:34:04 +0200
commit9a2a46a42ea183716aefd2562591483f154e3d21 (patch)
tree3f881b107c42d281809b0074a60a14b129b0bee7 /ishtar_common/templates
parentc9e00034be8afb8adfb19ebb4807e9a542152c1c (diff)
downloadIshtar-9a2a46a42ea183716aefd2562591483f154e3d21.tar.bz2
Ishtar-9a2a46a42ea183716aefd2562591483f154e3d21.zip
🩹 sheet: fix "full_label" display of hierarchical types
Diffstat (limited to 'ishtar_common/templates')
-rw-r--r--ishtar_common/templates/ishtar/blocks/window_field_flex.html2
-rw-r--r--ishtar_common/templates/ishtar/blocks/window_field_flex_multiple.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/ishtar_common/templates/ishtar/blocks/window_field_flex.html b/ishtar_common/templates/ishtar/blocks/window_field_flex.html
index 133750bee..b1cb1ed30 100644
--- a/ishtar_common/templates/ishtar/blocks/window_field_flex.html
+++ b/ishtar_common/templates/ishtar/blocks/window_field_flex.html
@@ -1,6 +1,6 @@
{% load i18n %}{% if data %}
<dl class="col-12 {% if size == 2 %}col-lg-6{% else %}col-md-6 col-lg-3{% endif %} flex-wrap">
<dt>{% trans caption %}</dt>
- <dd>{{pre_data|safe}}{{data|linebreaksbr}}{{post_data|safe }}</dd>
+ <dd>{{pre_data|safe}}{% if data.has_full_label %}{{data.full_label}}{% else %}{{data|linebreaksbr}}{% endif %}{{post_data|safe }}</dd>
</dl>
{% endif %}
diff --git a/ishtar_common/templates/ishtar/blocks/window_field_flex_multiple.html b/ishtar_common/templates/ishtar/blocks/window_field_flex_multiple.html
index 1587963c5..4ed64cc05 100644
--- a/ishtar_common/templates/ishtar/blocks/window_field_flex_multiple.html
+++ b/ishtar_common/templates/ishtar/blocks/window_field_flex_multiple.html
@@ -2,7 +2,7 @@
<dl class="col-12 {% if size == 2 %}col-lg-6{% else %}col-md-6 col-lg-3{% endif %} flex-wrap">
<dt>{% trans caption %}</dt>
<dd>{% if not external %}{% for d in data.all %}
- {% if forloop.counter0 %} ; {% endif %}{{ d }}
+ {% if forloop.counter0 %} ; {% endif %}{% if d.has_full_label %}{{ d.full_label }}{% else %}{{d}}{% endif %}
{% endfor %}{% else %}{{data}}{% endif %}</dd>
</dl>
{% endif %}