darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-06-23 17:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Treat permanent failure for letters the same as cancelled

Browse Source
This commit is contained in:
Chris Hill-Scott
2019-01-14 09:57:36 +00:00
parent c1158d7d70
commit 5c4ff09d48
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/__init__.py
View File

@@ -365,7 +365,7 @@ def format_notification_status(status, template_type):
'failed': '',
'technical-failure': 'Technical failure',
'temporary-failure': '',
'permanent-failure': 'Cancelled',
'permanent-failure': '',
'delivered': '',
'received': '',
'accepted': '',

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

@@ -144,7 +144,7 @@
{% macro notification_status_field(notification) %}
{% set displayed_on_single_line = notification.status in ['created', 'pending', 'pending-virus-check', 'sending', 'sent', 'delivered', 'returned-letter', 'accepted', 'received'] %}
{% set displayed_on_single_line = notification.status in ['created', 'pending', 'pending-virus-check', 'sending', 'sent', 'delivered', 'returned-letter', 'accepted', 'received', 'permanent-failure'] %}
{% if not notification %}
{% call field(align='right') %}{% endcall %}

2
tests/app/main/views/test_activity.py
View File

@@ -608,8 +608,8 @@ def test_big_numbers_and_search_dont_show_for_letters(
('letter', 'delivered', '27 September at 5:30pm', True),
('letter', 'received', '27 September at 5:30pm', True),
('letter', 'accepted', '27 September at 5:30pm', True),
('letter', 'permanent-failure', '27 September at 5:31pm', True),
('letter', 'virus-scan-failed', 'Virus detected 27 September at 5:30pm', False),
('letter', 'permanent-failure', 'Cancelled 27 September at 5:31pm', False),
('letter', 'validation-failed', 'Validation failed 27 September at 5:30pm', False),
('letter', 'technical-failure', 'Technical failure 27 September at 5:30pm', False),
]