darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-12 01:14:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Include template values when calculating letter page count

Browse Source 
When sending a letter we check how many pages it has and this number
then determines how many PNG images we ask template preview for. When
calculating the page count, we were getting the page count for the
template as it comes from the database (so without any placeholders
filled in). But filling in placeholders in a letter may cause the number
of pages to change, which was the cause of the 'Letter does not have a
page x' errors we were seeing from template-preview.

Now, when we calculate the letter page count during sending, we take the
placeholders that have already been filled in into account.
This commit is contained in:
Katie Smith
2020-07-21 16:06:33 +01:00
parent 0d6ef2977d
commit 716977fe75
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/main/views/send.py
View File

@@ -436,6 +436,9 @@ def send_test_step(service_id, template_id, step_index):
email_reply_to = get_email_reply_to_address_from_session()
elif db_template['template_type'] == 'sms':
sms_sender = get_sms_sender_from_session()
template_values = get_recipient_and_placeholders_from_session(db_template['template_type'])
template = get_template(
db_template,
current_service,
@@ -446,7 +449,7 @@ def send_test_step(service_id, template_id, step_index):
template_id=template_id,
filetype='png',
),
page_count=get_page_count_for_letter(db_template),
page_count=get_page_count_for_letter(db_template, values=template_values),
email_reply_to=email_reply_to,
sms_sender=sms_sender
)
@@ -520,7 +523,7 @@ def send_test_step(service_id, template_id, step_index):
back_link = get_back_link(service_id, template, step_index, placeholders)
template.values = get_recipient_and_placeholders_from_session(template.template_type)
template.values = template_values
template.values[current_placeholder] = None
return render_template(
@@ -1039,6 +1042,7 @@ def _check_notification(service_id, template_id, exception=None):
template.values = get_recipient_and_placeholders_from_session(template.template_type)
page_count = get_page_count_for_letter(db_template, template.values)
template.page_count = page_count
return dict(
template=template,
back_link=back_link,