diff --git a/caseworker/advice/forms/approval.py b/caseworker/advice/forms/approval.py index f9771416e..81330bff7 100644 --- a/caseworker/advice/forms/approval.py +++ b/caseworker/advice/forms/approval.py @@ -89,7 +89,7 @@ def get_layout_fields(self): class LicenceConditionsForm(PicklistAdviceForm, BaseForm): class Layout: - TITLE = "Add licence conditions, instructions to exporter or footnotes (optional)" + TITLE = "Add licence conditions (optional)" proviso = forms.CharField( widget=forms.Textarea(attrs={"rows": 7, "class": "govuk-!-margin-top-4"}), @@ -104,7 +104,7 @@ class Layout: choices=(), ) proviso_checkboxes = forms.MultipleChoiceField( - label="Add a licence condition (optional)", + label="", required=False, widget=forms.CheckboxSelectMultiple, choices=(), @@ -143,7 +143,7 @@ def get_layout_fields(self): class FootnotesApprovalAdviceForm(PicklistAdviceForm, BaseForm): class Layout: - TITLE = "Instructions for the exporter (optional)" + TITLE = "Add instructions to the exporter, or a reporting footnote (optional)" instructions_to_exporter = forms.CharField( widget=forms.Textarea(attrs={"rows": "3"}), diff --git a/caseworker/advice/forms/edit.py b/caseworker/advice/forms/edit.py index f8e270a3f..ef68bed30 100644 --- a/caseworker/advice/forms/edit.py +++ b/caseworker/advice/forms/edit.py @@ -5,7 +5,7 @@ class PicklistApprovalAdviceEditForm(BaseForm): class Layout: - TITLE = "Add licence conditions, instructions to exporter or footnotes (optional)" + TITLE = "Add licence conditions (optional)" proviso = forms.CharField( widget=forms.Textarea(attrs={"rows": 30, "class": "govuk-!-margin-top-4"}), diff --git a/unit_tests/caseworker/advice/views/test_edit_advice.py b/unit_tests/caseworker/advice/views/test_edit_advice.py index 90a0789bf..7dc8fc90c 100644 --- a/unit_tests/caseworker/advice/views/test_edit_advice.py +++ b/unit_tests/caseworker/advice/views/test_edit_advice.py @@ -374,7 +374,7 @@ def test_DESNZ_give_approval_advice_post_valid_add_conditional( soup = beautiful_soup(response.content) # redirected to next form header = soup.find("h1") - assert header.text == "Add licence conditions, instructions to exporter or footnotes (optional)" + assert header.text == "Add licence conditions (optional)" add_licence_condition_response = post_to_step( AdviceSteps.LICENCE_CONDITIONS, @@ -384,7 +384,7 @@ def test_DESNZ_give_approval_advice_post_valid_add_conditional( soup = beautiful_soup(add_licence_condition_response.content) # redirected to next form header = soup.find("h1") - assert header.text == "Instructions for the exporter (optional)" + assert header.text == "Add instructions to the exporter, or a reporting footnote (optional)" add_instructions_response = post_to_step( AdviceSteps.LICENCE_FOOTNOTES, diff --git a/unit_tests/caseworker/advice/views/test_give_approval_advice_view.py b/unit_tests/caseworker/advice/views/test_give_approval_advice_view.py index 5a7e6a5eb..a92dac9b5 100644 --- a/unit_tests/caseworker/advice/views/test_give_approval_advice_view.py +++ b/unit_tests/caseworker/advice/views/test_give_approval_advice_view.py @@ -193,7 +193,7 @@ def test_DESNZ_give_approval_advice_post_valid_add_conditional( soup = beautiful_soup(response.content) # redirected to next form header = soup.find("h1") - assert header.text == "Add licence conditions, instructions to exporter or footnotes (optional)" + assert header.text == "Add licence conditions (optional)" add_LC_response = post_to_step( AdviceSteps.LICENCE_CONDITIONS, @@ -203,7 +203,7 @@ def test_DESNZ_give_approval_advice_post_valid_add_conditional( soup = beautiful_soup(add_LC_response.content) # redirected to next form header = soup.find("h1") - assert header.text == "Instructions for the exporter (optional)" + assert header.text == "Add instructions to the exporter, or a reporting footnote (optional)" add_instructions_response = post_to_step( AdviceSteps.LICENCE_FOOTNOTES, @@ -246,7 +246,7 @@ def test_DESNZ_give_approval_advice_post_valid_add_conditional_optional( soup = beautiful_soup(response.content) # redirected to next form header = soup.find("h1") - assert header.text == "Add licence conditions, instructions to exporter or footnotes (optional)" + assert header.text == "Add licence conditions (optional)" add_LC_response = post_to_step( AdviceSteps.LICENCE_CONDITIONS, @@ -256,7 +256,7 @@ def test_DESNZ_give_approval_advice_post_valid_add_conditional_optional( soup = beautiful_soup(add_LC_response.content) # redirected to next form header = soup.find("h1") - assert header.text == "Instructions for the exporter (optional)" + assert header.text == "Add instructions to the exporter, or a reporting footnote (optional)" add_instructions_response = post_to_step( AdviceSteps.LICENCE_FOOTNOTES,