From 6aaa4d906b7e052d37046bcd7cc993c4df8ef867 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Thu, 25 Jun 2020 16:37:07 +0100 Subject: [PATCH] Convert radios on add nhs local org page (basic) --- app/main/forms.py | 2 +- .../views/organisations/add-nhs-local-organisation.html | 5 ++--- tests/app/main/views/organisations/test_organisation.py | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index f1aad0724..73cd485be 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1157,7 +1157,7 @@ class AddNHSLocalOrganisationForm(StripWhitespaceForm): super().__init__(*args, **kwargs) self.organisations.choices = organisation_choices - organisations = RadioField( + organisations = GovukRadiosField( 'Which NHS Trust or Clinical Commissioning Group do you work for?', thing='an NHS Trust or Clinical Commissioning Group' ) diff --git a/app/templates/views/organisations/add-nhs-local-organisation.html b/app/templates/views/organisations/add-nhs-local-organisation.html index 17f12a6e4..f07d8fbc5 100644 --- a/app/templates/views/organisations/add-nhs-local-organisation.html +++ b/app/templates/views/organisations/add-nhs-local-organisation.html @@ -1,7 +1,6 @@ {% extends "withnav_template.html" %} {% from "components/page-header.html" import page_header %} {% from "components/page-footer.html" import sticky_page_footer %} -{% from "components/radios.html" import radios %} {% from "components/live-search.html" import live_search %} {% from "components/form.html" import form_wrapper %} @@ -21,13 +20,13 @@ {{ form.organisations.label.text }}

{{ live_search( - target_selector='.multiple-choice', + target_selector='.govuk-radios__item', show=True, form=search_form, label='Search by name', autofocus=True) }} - {{ radios(form.organisations, hide_legend=True) }} + {{ form.organisations }} {{ sticky_page_footer('Continue') }} {% endcall %} {% endblock %} diff --git a/tests/app/main/views/organisations/test_organisation.py b/tests/app/main/views/organisations/test_organisation.py index 6f33da32d..c2e4f7a7d 100644 --- a/tests/app/main/views/organisations/test_organisation.py +++ b/tests/app/main/views/organisations/test_organisation.py @@ -261,14 +261,14 @@ def test_nhs_local_can_create_own_organisations( 'Which NHS Trust or Clinical Commissioning Group do you work for?' ) assert page.select_one('[data-module=live-search]')['data-targets'] == ( - '.multiple-choice' + '.govuk-radios__item' ) assert [ ( normalize_spaces(radio.select_one('label').text), radio.select_one('input')['value'] ) - for radio in page.select('.multiple-choice') + for radio in page.select('.govuk-radios__item') ] == [ ('Trust 1', 't1'), ('Trust 2', 't2'),