darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-05-05 16:38:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor uploads preview error banner to use a shared component

Browse Source 
Also refactor a corresponding test to avoid asserting on the content
This commit is contained in:
Pea Tyczynska
2019-10-24 22:57:05 +01:00
parent f2c7eb5c3e
commit 5e10ed23a1
5 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/main/views/uploads.py
View File

@@ -145,13 +145,13 @@ def uploaded_letter_preview(service_id, file_id):
original_filename = metadata.get('filename')
page_count = metadata.get('page_count')
status = metadata.get('status')
error_message = metadata.get('message')
error_shortcode = metadata.get('message')
invalid_pages = metadata.get('invalid_pages')
if invalid_pages:
invalid_pages = json.loads(invalid_pages)
error = get_letter_validation_error(error_message, invalid_pages, page_count)
error_message = get_letter_validation_error(error_shortcode, invalid_pages, page_count)
template_dict = service_api_client.get_precompiled_template(service_id)
# Override pre compiled letter template postage to none as it has not yet been picked even though
# the pre compiled letter template has its postage set as second class as the DB currently requires
@@ -177,7 +177,8 @@ def uploaded_letter_preview(service_id, file_id):
template=template,
status=status,
file_id=file_id,
error=error,
message=error_message,
error_code=error_shortcode,
form=form,
)