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

Skip over placeholders if they’re in the address

Browse Source 
We don’t really want you modifying lines of the address after you’ve
entered it. Especially when it might not be obvious that modifying the
address line placeholder will modify the address you’re sending the
letter to.
This commit is contained in:
Chris Hill-Scott
2020-04-09 15:45:30 +01:00
parent 6c7e6fa64e
commit b68dd569fc
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -472,10 +472,21 @@ def send_test_step(service_id, template_id, step_index):
))
# if we're in a letter, we should show address block rather than "address line #" or "postcode"
if template.template_type == 'letter' and (
step_index < len(first_column_headings['letter'])
):
return redirect(url_for('.send_one_off_letter_address', service_id=service_id, template_id=template_id))
if template.template_type == 'letter':
if step_index < len(first_column_headings['letter']):
return redirect(url_for(
'.send_one_off_letter_address',
service_id=service_id,
template_id=template_id,
))
if current_placeholder in Columns(PostalAddress('').as_personalisation):
return redirect(url_for(
request.endpoint,
service_id=service_id,
template_id=template_id,
step_index=step_index + 1,
help=get_help_argument(),
))
form = get_placeholder_form_instance(
current_placeholder,