From d793d08ae727360f9bff97c2d013c7e00f037d2f Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Thu, 15 Oct 2020 13:18:23 +0100 Subject: [PATCH] Fix back links when viewing a broadcast MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Where you go back to from a broadcast can now depend on whether it’s a current or previous broadcast. --- app/main/views/broadcast.py | 8 ++++++++ app/templates/views/broadcast/view-message.html | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/main/views/broadcast.py b/app/main/views/broadcast.py index f20eb3fcd..a8da1d859 100644 --- a/app/main/views/broadcast.py +++ b/app/main/views/broadcast.py @@ -295,6 +295,14 @@ def view_broadcast(service_id, broadcast_message_id): return render_template( 'views/broadcast/view-message.html', broadcast_message=broadcast_message, + back_link={ + 'main.view_current_broadcast': url_for( + '.broadcast_dashboard', service_id=current_service.id + ), + 'main.view_previous_broadcast': url_for( + '.broadcast_dashboard_previous', service_id=current_service.id + ), + }[request.endpoint], ) diff --git a/app/templates/views/broadcast/view-message.html b/app/templates/views/broadcast/view-message.html index 5d1c9aff6..74d5fa955 100644 --- a/app/templates/views/broadcast/view-message.html +++ b/app/templates/views/broadcast/view-message.html @@ -34,7 +34,7 @@ {% block maincolumn_content %} - {{ govukBackLink({ "href": url_for('.broadcast_dashboard', service_id=current_service.id) }) }} + {{ govukBackLink({ "href": back_link }) }} {% if broadcast_message.status == 'pending-approval' %} {% if broadcast_message.created_by == current_user and current_user.has_permissions('send_messages') %}