darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-03-31 15:46:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2481 from alphagov/fix_bug_preview_overlay

Browse Source 
Fix bug in precompiled preview with overlay
This commit is contained in:
Pea (Malgorzata Tyczynska)
2019-04-25 10:34:02 +01:00
committed by GitHub
parent a348e6bbf2 454690a008
commit 3c4133e543
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/template/rest.py
View File

@@ -240,10 +240,11 @@ def preview_letter_template_by_notification_id(service_id, notification_id, file
if overlay:
path = '/precompiled/overlay.{}'.format(file_type)
query_string = '?page_number={}'.format(page_number) if file_type == 'png' else ''
content = pdf_file
elif file_type == 'png':
query_string = '?hide_notify=true' if page_number == '1' else ''
path = '/precompiled-preview.png' + query_string
path = '/precompiled-preview.png'
else:
path = None
@@ -259,7 +260,7 @@ def preview_letter_template_by_notification_id(service_id, notification_id, file
)
if path:
url = current_app.config['TEMPLATE_PREVIEW_API_HOST'] + path
url = current_app.config['TEMPLATE_PREVIEW_API_HOST'] + path + query_string
response_content = _get_png_preview_or_overlaid_pdf(url, content, notification.id, json=False)
else:
response_content = content

2
tests/app/template/test_rest.py
View File

@@ -1102,7 +1102,7 @@ def test_preview_letter_template_precompiled_s3_error(
"filetype, post_url, overlay",
[
('png', 'precompiled-preview.png', None),
('png', 'precompiled/overlay.png', 1),
('png', 'precompiled/overlay.png?page_number=1', 1),
('pdf', 'precompiled/overlay.pdf', 1)
]
)