darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-20 15:31:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3404 from alphagov/remove-redundant-conditional-180477467

Browse Source 
Remove redundant conditional for letter branding
This commit is contained in:
Ben Thorner
2021-12-21 13:35:59 +00:00
committed by GitHub
parent c52cb4a8a8 76da31c32a
commit f65fb519c7
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/dao/services_dao.py
View File

@@ -318,15 +318,17 @@ def dao_create_service(
if organisation: if organisation:
service.organisation_id = organisation.id service.organisation_id = organisation.id
service.organisation_type = organisation.organisation_type service.organisation_type = organisation.organisation_type
if organisation.email_branding: if organisation.email_branding:
service.email_branding = organisation.email_branding service.email_branding = organisation.email_branding
if organisation.letter_branding and not service.letter_branding: if organisation.letter_branding:
service.letter_branding = organisation.letter_branding service.letter_branding = organisation.letter_branding
elif service.organisation_type in NHS_ORGANISATION_TYPES or email_address_is_nhs(user.email_address): elif service.organisation_type in NHS_ORGANISATION_TYPES or email_address_is_nhs(user.email_address):
service.email_branding = dao_get_email_branding_by_name('NHS') service.email_branding = dao_get_email_branding_by_name('NHS')
service.letter_branding = dao_get_letter_branding_by_name('NHS') service.letter_branding = dao_get_letter_branding_by_name('NHS')
if organisation: if organisation:
service.crown = organisation.crown service.crown = organisation.crown
elif service.organisation_type in CROWN_ORGANISATION_TYPES: elif service.organisation_type in CROWN_ORGANISATION_TYPES: