Skip to content

Commit

Permalink
record details: filter files and media files by status completed
Browse files Browse the repository at this point in the history
* don't include render of pending/failed files and media files in landing page and in request view
* closes zenodo/rdm-project#471
  • Loading branch information
anikachurilova committed Dec 1, 2023
1 parent c95e832 commit 612b8f9
Showing 1 changed file with 13 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -240,16 +240,17 @@ <h1 id="record-title" class="wrap-overflowing-text">{{ metadata.title }}</h1>
{# record has files BUT passed files are empty. This happens when we display are request. #}
{%- if files and record.files.enabled -%}
<section id="record-files" class="rel-mt-2 rel-mb-3" aria-label="{{ _('Files') }}">
<h2 id="files-heading">{{ _('Files') }}</h2>
{%- if permissions.can_read_files -%}
{# record has files AND user can see files #}
{%- set files = files|order_entries %}

{%- if files|has_previewable_files -%}
{%-set preview_file = files|select_preview_file(default_preview=record.files.default_preview) %}
{{ preview_file_box(preview_file, record.id, is_preview, record, include_deleted) }}
{%- endif -%}
{{ file_list_box(files, record.id, is_preview, include_deleted, record) }}
{%- set files = files | order_entries | selectattr("status", "==", "completed") | list %}
{%- if files|length > 0 -%}
<h2 id="files-heading">{{ _('Files') }}</h2>
{%- if files|has_previewable_files -%}
{%-set preview_file = files|select_preview_file(default_preview=record.files.default_preview) %}
{{ preview_file_box(preview_file, record.id, is_preview, record, include_deleted) }}
{%- endif -%}
{{ file_list_box(files, record.id, is_preview, include_deleted, record) }}
{% endif %}
{% else %}
{# record has files BUT user does not have permission to see files #}
<div class="ui accordion panel mb-10 {{ record.ui.access_status.id }}"
Expand Down Expand Up @@ -307,8 +308,10 @@ <h4>{{ _("Request access") }}</h4>
{# can_media_read_files is false when record is fully restricted and users can't see the landing page at all #}
{%- if media_files and media_files.enabled and media_files.entries and permissions.can_media_read_files -%}
<section id="record-media-files" aria-label="{{ _('System files') }}">
{%- set media_files = media_files|order_entries %}
{{ media_file_list_box(media_files, record.id, is_preview, include_deleted, record) }}
{%- set media_files = media_files | order_entries | selectattr("status", "==", "completed") | list %}
{%- if media_files|length > 0 -%}
{{ media_file_list_box(media_files, record.id, is_preview, include_deleted, record) }}
{%- endif %}
</section>
{%- endif %}
{%- endblock record_media_files -%}
Expand Down

0 comments on commit 612b8f9

Please sign in to comment.