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

Refactor to pass through whole postal address

Browse Source 
It’s a bit cleaner to not be passing through multiple variables which
are properties of the same object.
This commit is contained in:
Chris Hill-Scott
2020-05-20 11:25:09 +01:00
parent b2ad7ff3cb
commit 782f43059d
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -299,8 +299,7 @@ def uploaded_letter_preview(service_id, file_id):
message=error_message, message=error_message,
error_code=error_shortcode, error_code=error_shortcode,
form=form, form=form,
recipient=postal_address.as_single_line, postal_address=postal_address,
international=postal_address.international,
re_upload_form=re_upload_form re_upload_form=re_upload_form
) )

4
app/templates/views/uploads/preview.html
View File

@@ -48,11 +48,11 @@
{% if status == 'valid' %} {% if status == 'valid' %}
<div class="js-stick-at-bottom-when-scrolling"> <div class="js-stick-at-bottom-when-scrolling">
<p class="top-gutter-0 bottom-gutter-1-2 send-recipient" title="{{ recipient }}"> <p class="top-gutter-0 bottom-gutter-1-2 send-recipient" title="{{ recipient }}">
Recipient: {{ recipient }} Recipient: {{ postal_address.as_single_line }}
</p> </p>
{% if current_service.live %} {% if current_service.live %}
{% if international %} {% if postal_address.international %}
<p class="govuk-body"> <p class="govuk-body">
Postage: international Postage: international
</p> </p>