From 7f3831af2e51b186c5e6730792e4ca2bc03920b4 Mon Sep 17 00:00:00 2001
From: Benjamin Becker <benjamin.becker@dataport.de>
Date: Tue, 29 Oct 2019 15:11:04 +0000
Subject: [PATCH] prevents display of categories and timerange if empty
---
ckanext/odsh/templates/package/snippets/info.html | 6 +++++-
ckanext/odsh/templates/snippets/package_item.html | 2 ++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/ckanext/odsh/templates/package/snippets/info.html b/ckanext/odsh/templates/package/snippets/info.html
index 08a1aef6..721cc404 100644
--- a/ckanext/odsh/templates/package/snippets/info.html
+++ b/ckanext/odsh/templates/package/snippets/info.html
@@ -45,6 +45,7 @@ Example:
{% endblock language %}
{% block groups %} {# aka categories #}
+ {% if pkg.groups|length %}
<div class="info-detail groups-detail">
<div>
{% trans category_count=pkg.groups|length %}
@@ -64,14 +65,17 @@ Example:
</span>
{% endfor %}
</div>
+ {% endif %}
{% endblock groups %}
{% block timerange %}
+ {% if daterange %}
<div class="timerange-detail info-detail">
<div>{{ _('timerange') }}:</div>
- <p>{{ daterange if daterange else '-' }}</p>
+ <p>{{ daterange }}</p>
</div>
+ {% endif %}
{% endblock timerange %}
diff --git a/ckanext/odsh/templates/snippets/package_item.html b/ckanext/odsh/templates/snippets/package_item.html
index a0800747..0ee64720 100644
--- a/ckanext/odsh/templates/snippets/package_item.html
+++ b/ckanext/odsh/templates/snippets/package_item.html
@@ -91,6 +91,7 @@ Example:
{% endblock banner%}
{% block notes %}
+ {% if package.groups|length %}
<p class='package-info-category'>
<span class='category-header'>
{% trans category_count=package.groups|length %}
@@ -110,6 +111,7 @@ Example:
</span>
{% endfor %}
</p>
+ {% endif %}
<p class='package-info-subject'>{{ _('subject') }}: {{ subject_text }} </p>
<p class='package-info-issued'>{{ _('issued') }}: {{issued}} </p>
{% endblock notes %}
--
GitLab