Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor document-list macro for compatibility Jinja2 templates #3179

Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/components/document-list/_macro.njk
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,11 @@
<a href="{{ document.url }}">{{ document.title }}
{%- if document.metadata and document.metadata.file %}
<span class="ons-u-vh">
{% set fileMetadataItems = [] %}
{% if document.metadata.file.fileType %}{% set fileMetadataItems = (fileMetadataItems.push(document.metadata.file.fileType + ' document download'), fileMetadataItems) %}{% endif %}
{% if document.metadata.file.fileSize %}{% set fileMetadataItems = (fileMetadataItems.push(document.metadata.file.fileSize), fileMetadataItems) %}{% endif %}
{% if document.metadata.file.filePages %}{% set fileMetadataItems = (fileMetadataItems.push(document.metadata.file.filePages), fileMetadataItems) %}{% endif %}
{% set fileMetadataItems = [
document.metadata.file.fileType + ' document download' if document.metadata.file.fileType,
document.metadata.file.fileSize if document.metadata.file.fileSize,
document.metadata.file.filePages if document.metadata.file.filePages ]
%}

, {{ fileMetadataItems | join(', ') }}

Expand Down Expand Up @@ -76,12 +77,11 @@
{%- if document.metadata.file and document.metadata.file.fileType %}

<li class="ons-document-list__item-attribute" aria-hidden="true">
{% set fileMetadataItems = [] %}

{% if document.metadata.file.fileType %}{% set fileMetadataItems = (fileMetadataItems.push(document.metadata.file.fileType), fileMetadataItems) %}{% endif %}
{% if document.metadata.file.fileSize %}{% set fileMetadataItems = (fileMetadataItems.push(document.metadata.file.fileSize), fileMetadataItems) %}{% endif %}
{% if document.metadata.file.filePages %}{% set fileMetadataItems = (fileMetadataItems.push(document.metadata.file.filePages), fileMetadataItems) %}{% endif %}

{% set fileMetadataItems = [
document.metadata.file.fileType if document.metadata.file.fileType,
document.metadata.file.fileSize if document.metadata.file.fileSize,
document.metadata.file.filePages if document.metadata.file.filePages ]
%}
{{ fileMetadataItems | join(', ') }}
</li>

Expand Down
Loading