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

Merge pull request #3341 from alphagov/hide-postage-validation-failed

Browse Source 
Don’t show the postage when validation has failed
This commit is contained in:
Chris Hill-Scott
2020-03-03 14:37:14 +00:00
committed by GitHub
parent e155794cbc b236df523c
commit 22d1b353d5
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/main/views/notifications.py
View File

@@ -78,7 +78,10 @@ def view_notification(service_id, notification_id):
page_count = get_page_count_for_letter(notification['template'], values=personalisation) page_count = get_page_count_for_letter(notification['template'], values=personalisation)
if notification.get('postage'): if notification.get('postage'):
notification['template']['postage'] = notification['postage'] if notification["status"] == "validation-failed":
notification['template']['postage'] = None
else:
notification['template']['postage'] = notification['postage']
template = get_template( template = get_template(
notification['template'], notification['template'],
current_service, current_service,

1
tests/app/main/views/test_notifications.py
View File

@@ -405,6 +405,7 @@ def test_notification_page_shows_validation_failed_precompiled_letter(
assert not page.select('p.notification-status') assert not page.select('p.notification-status')
assert page.select_one('main img')['src'].endswith('.png?page=1') assert page.select_one('main img')['src'].endswith('.png?page=1')
assert not page.select('.letter-postage')
@pytest.mark.parametrize('notification_status, expected_message', ( @pytest.mark.parametrize('notification_status, expected_message', (