From a034ee0e1f57ae24b57270bc2a9fcfc3e633f288 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Wed, 8 Jul 2020 15:06:05 +0100 Subject: [PATCH 1/2] Remove duplicate live search control I must have introduced this while resolving a merge conflict. Oops. --- app/templates/views/broadcast/areas.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/templates/views/broadcast/areas.html b/app/templates/views/broadcast/areas.html index b3d979dbc..3b48b75b9 100644 --- a/app/templates/views/broadcast/areas.html +++ b/app/templates/views/broadcast/areas.html @@ -19,8 +19,6 @@ {{ live_search(target_selector='.multiple-choice', show=show_search_form, form=search_form, label='Search by name') }} - {{ live_search(target_selector='.multiple-choice', show=show_search_form, form=search_form, label='Search by name') }} - {% call form_wrapper() %} {{ checkboxes(form.areas, hide_legend=True) }} {{ sticky_page_footer('Add to broadcast') }} From 653b6b3601f845c119921dbba8aad1ae0eaf2f74 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Wed, 8 Jul 2020 15:12:29 +0100 Subject: [PATCH 2/2] Fix test broken by merging The test came from one branch, the correct value came from another. --- tests/app/test_navigation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/app/test_navigation.py b/tests/app/test_navigation.py index 92507b07b..efd28c752 100644 --- a/tests/app/test_navigation.py +++ b/tests/app/test_navigation.py @@ -188,7 +188,7 @@ def test_navigation_for_services_with_broadcast_permission( assert [ a['href'] for a in page.select('.navigation a') ] == [ - '/services/{}'.format(SERVICE_ONE_ID), + '/services/{}/broadcast-dashboard'.format(SERVICE_ONE_ID), '/services/{}/templates'.format(SERVICE_ONE_ID), '/services/{}/users'.format(SERVICE_ONE_ID), '/services/{}/service-settings'.format(SERVICE_ONE_ID),