Don't fallback to dvla_organisation if letter branding unset

The template preview app now accepts a null value for the `filename` 
parameter. If a service doesn't have a letter branding option set, 
previously we defaulted to their dvla_organisation (probably HM 
Government). Now, we pass through None, so that we generate letters 
without any logo or branding.
This commit is contained in:
Leo Hemsted
2019-02-12 15:47:50 +00:00
parent a8ee92cf03
commit afc5c96927
6 changed files with 10 additions and 16 deletions

View File

@@ -265,9 +265,7 @@ def preview_letter_template_by_notification_id(service_id, notification_id, file
}
service = dao_fetch_service_by_id(service_id)
# We only need this while we are migrating to the new letter_branding model
letter_logo_filename = service.letter_branding.filename if service.letter_branding \
else service.dvla_organisation.filename
letter_logo_filename = service.letter_branding and service.letter_branding.filename
data = {
'letter_contact_block': notification.reply_to_text,
'template': template_for_letter_print,