diff --git a/ckanext/scheming/templates/scheming/package/snippets/additional_info.html b/ckanext/scheming/templates/scheming/package/snippets/additional_info.html index f35954f..939ae8f 100644 --- a/ckanext/scheming/templates/scheming/package/snippets/additional_info.html +++ b/ckanext/scheming/templates/scheming/package/snippets/additional_info.html @@ -1,7 +1,6 @@ {% extends "package/snippets/additional_info.html" %} - -{%- -set exclude_fields = [ +{%- set trimmed_keys = h.psbthemealt_remove_falsy_values(pkg_dict) | list -%} +{%- set exclude_fields = [ 'id', 'title_translated', 'title', @@ -9,29 +8,22 @@ 'notes', 'notes_translated', 'tag_string', - 'license_id', 'owner_org' ] -%} {% 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 - and pkg_dict[field.field_name] is not none and pkg_dict[field.field_name] -%} + {%- 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 %}