darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-21 07:51:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug in precompiled preview with overlay

Browse Source 
The bug treated all pages of png preview as if they were all first
page, showing overlay for address bar
This commit is contained in:
Pea Tyczynska
2019-04-24 18:29:01 +01:00
parent a348e6bbf2
commit 454690a008
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)
]
)