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

Merge pull request #2964 from alphagov/different-back-link-from-job

Browse Source 
Always go back to previous page from notification
This commit is contained in:
Chris Hill-Scott
2019-05-15 16:26:34 +01:00
committed by GitHub
parent 9c21541d2e 4fc7498415
commit 61b056e490
6 changed files with 74 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,6 +101,22 @@ def view_notification(service_id, notification_id):
show_cancel_button = notification['notification_type'] == 'letter' and \
letter_can_be_cancelled(notification['status'], notification_created)
if request.args.get('help') == '0':
back_link = None
elif request.args.get('from_job'):
back_link = url_for(
'main.view_job',
service_id=current_service.id,
job_id=request.args.get('from_job'),
)
else:
back_link = url_for(
'main.view_notifications',
service_id=current_service.id,
message_type=template.template_type,
status='sending,delivered,failed',
)
return render_template(
'views/notifications/notification.html',
finished=(notification['status'] in (DELIVERED_STATUSES + FAILURE_STATUSES)),
@@ -133,6 +149,7 @@ def view_notification(service_id, notification_id):
sent_with_test_key=(
notification.get('key_type') == KEY_TYPE_TEST
),
back_link=back_link,
)