From 332c240b013c2f4ad2b74fc9bdea1ff9e61abdcd Mon Sep 17 00:00:00 2001 From: Ben Thorner Date: Wed, 23 Mar 2022 15:22:54 +0000 Subject: [PATCH] Use "get_email_choices" directly in branding view --- app/main/forms.py | 7 ++----- app/main/views/service_settings.py | 4 +++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index 350b34798..81a747cea 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -2200,13 +2200,10 @@ class ChooseEmailBrandingForm(ChooseBrandingForm): def __init__(self, service): super().__init__() - self.options.choices = tuple(self.get_available_choices(service)) - @classmethod - def get_available_choices(cls, service): - return ( + self.options.choices = tuple( list(branding.get_email_choices(service)) + - [cls.FALLBACK_OPTION] + [self.FALLBACK_OPTION] ) diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py index 2592df006..3987cdefa 100644 --- a/app/main/views/service_settings.py +++ b/app/main/views/service_settings.py @@ -70,6 +70,7 @@ from app.main.forms import ( ) from app.utils import DELIVERED_STATUSES, FAILURE_STATUSES, SENDING_STATUSES from app.utils.branding import NHS_EMAIL_BRANDING_ID +from app.utils.branding import get_email_choices as get_email_branding_choices from app.utils.user import ( user_has_permissions, user_is_gov_user, @@ -1178,8 +1179,9 @@ def email_branding_request(service_id): def check_email_branding_allowed_for_service(branding): allowed_branding_for_service = dict( - ChooseEmailBrandingForm.get_available_choices(current_service) + get_email_branding_choices(current_service) ) + if branding not in allowed_branding_for_service: abort(404)