darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-19 05:59:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Display the two new virus states for letters

Browse Source 
Precompiled letters can now have two additional states:
* pending-virus-check
* virus-scan-failed

Both new states should show in the notifications dashboard, and
virus-scan-failed should appear as an error state, with a descriptive
message. You should not be able to preview a letter in one of the two
new states, so the preview link has been removed for precompiled letters
in these states.
This commit is contained in:
Katie Smith
2018-03-19 15:25:26 +00:00
parent 6ba4cbc93c
commit 4db75f6a58
9 changed files with 101 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/templates/components/table.html
View File

@@ -140,7 +140,7 @@
{% if notification.status|format_notification_status_as_url %}
<a href="{{ notification.status|format_notification_status_as_url }}">
{% endif %}
{% if notification['notification_type'] != "letter" %}
{% if notification['notification_type'] != "letter" or notification.status == 'virus-scan-failed' %}
{{ notification.status|format_notification_status(
notification.template.template_type
) }}

6
app/templates/views/activity/notifications.html
View File

@@ -16,7 +16,11 @@
field_headings_visible=False
) %}
{% call row_heading() %}
<a class="file-list-filename" href="{{ url_for('.view_notification', service_id=current_service.id, notification_id=item.id) }}">{{ item.to }}</a>
{% if item.status in ('pending-virus-check', 'virus-scan-failed') %}
<span class="file-list-filename">{{ item.to }}</span>
{% else %}
<a class="file-list-filename" href="{{ url_for('.view_notification', service_id=current_service.id, notification_id=item.id) }}">{{ item.to }}</a>
{% endif %}
<p class="file-list-hint">
{{ item.preview_of_content }}
</p>

2
app/templates/views/api/index.html
View File

@@ -73,7 +73,7 @@
<dd class="api-notifications-item-data-item">{{ notification[key] }}</dd>
{% endif %}
{% endfor %}
{% if notification['notification_type'] == 'letter' %}
{% if notification['notification_type'] == 'letter' and notification.status not in ('pending-virus-check', 'virus-scan-failed') %}
<a href="{{ url_for('.view_notification', service_id=current_service.id, notification_id=notification.id) }}">View letter</a>
{% endif %}
</dl>