From b577db6fe63923ef900d0384c26c2c387453b2e0 Mon Sep 17 00:00:00 2001 From: Cormac Hallinan Date: Thu, 3 Oct 2024 16:16:43 +0000 Subject: [PATCH 1/2] excluding empty fields --- .../package/snippets/additional_info.html | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/ckanext/scheming/templates/scheming/package/snippets/additional_info.html b/ckanext/scheming/templates/scheming/package/snippets/additional_info.html index f8e0b9a..574750d 100644 --- a/ckanext/scheming/templates/scheming/package/snippets/additional_info.html +++ b/ckanext/scheming/templates/scheming/package/snippets/additional_info.html @@ -1,10 +1,12 @@ {% extends "package/snippets/additional_info.html" %} - +{%- set trimmed_keys = h.psbthemealt_remove_falsy_values(pkg_dict) | list -%} {%- set exclude_fields = [ 'id', + 'title_translated', 'title', 'name', 'notes', + 'notes_translated', 'tag_string', 'license_id', 'owner_org', @@ -12,22 +14,16 @@ {% block package_additional_info %} {%- for field in schema.dataset_fields -%} - {%- if field.field_name not in exclude_fields - and field.display_snippet is not none -%} + {%- if field.field_name not in exclude_fields and field.display_snippet is not none and field.field_name in trimmed_keys -%} - {{ - h.scheming_language_text(field.label) }} - {%- snippet 'scheming/snippets/display_field.html', - field=field, data=pkg_dict, schema=schema -%} + + {{h.scheming_language_text(field.label) }} + {{display_snippet}} + + + {%- snippet 'scheming/snippets/display_field.html', field=field, data=pkg_dict, schema=schema -%} + {%- endif -%} {%- endfor -%} - {% if h.check_access('package_update',{'id':pkg_dict.id}) %} - - {{ _("State") }} - {{ _(pkg_dict.state) }} - - {% endif %} {% endblock %} From cf177b901a87b57801120eefd15cbb2b5953c9ae Mon Sep 17 00:00:00 2001 From: Cormac Hallinan Date: Tue, 8 Oct 2024 14:35:42 +0000 Subject: [PATCH 2/2] show license --- .../templates/scheming/package/snippets/additional_info.html | 1 - 1 file changed, 1 deletion(-) diff --git a/ckanext/scheming/templates/scheming/package/snippets/additional_info.html b/ckanext/scheming/templates/scheming/package/snippets/additional_info.html index 53cd8af..939ae8f 100644 --- a/ckanext/scheming/templates/scheming/package/snippets/additional_info.html +++ b/ckanext/scheming/templates/scheming/package/snippets/additional_info.html @@ -8,7 +8,6 @@ 'notes', 'notes_translated', 'tag_string', - 'license_id', 'owner_org' ] -%}