Merge branch 'master' into download_link-activity-page

This commit is contained in:
Rebecca Law
2018-01-10 16:06:40 +00:00
49 changed files with 1146 additions and 1062 deletions

View File

@@ -318,11 +318,12 @@ def get_template(
template,
image_url=letter_preview_url,
page_count=int(page_count),
contact_block=template['reply_to_text']
)
else:
return LetterPreviewTemplate(
template,
contact_block=service['letter_contact_block'],
contact_block=template['reply_to_text'],
admin_base_url=current_app.config['ADMIN_BASE_URL'],
redact_missing_personalisation=redact_missing_personalisation,
)