darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-18 21:49:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Calculate page count based on template values when previewing

Browse Source 
Similar to the bug shown here
https://www.pivotaltracker.com/story/show/181513431, but to fix the case
when previewing a letter send using a CSV upload it wasn't using
template values to calculate the page length.
This commit is contained in:
David McDonald
2022-05-16 12:13:38 +01:00
committed by Katie Smith
parent 732bfffb93
commit 19e6e38426
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -645,6 +645,9 @@ def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_
) if not letters_as_pdf else None,
email_reply_to=email_reply_to,
sms_sender=sms_sender,
# In this case, we don't provide template values when calculating the page count
# because we don't know them at this point. It means that later on we will need to
# recalculate the page count once we have the values
page_count=get_page_count_for_letter(db_template),
)
recipients = RecipientCSV(
@@ -677,6 +680,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_
abort(404)
page_count = get_page_count_for_letter(db_template, template.values)
template.page_count = page_count
original_file_name = get_csv_metadata(service_id, upload_id).get('original_file_name', '')
return dict(