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

iron out kinks in recipient/placeholder handling

Browse Source 
where we were previously setting the placeholder when going through
the send self a test - however, should be setting recipient. Also,
only do this on step-0 of the one-off route, not the send-test route,
since step-0 of send-test is the first normal placeholder. Phew!
This commit is contained in:
Leo Hemsted
2017-06-26 10:58:43 +01:00
parent e46b635551
commit 47aaebacc3
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -255,8 +255,14 @@ def send_test_step(service_id, template_id, step_index):
) )
if form.validate_on_submit(): if form.validate_on_submit():
# if it's zero, we store against `recipient` as well, for easier extraction # if it's the first input (phone/email), we store against `recipient` as well, for easier extraction.
if step_index == 0 and template.template_type != 'letter': # Only if it's not a letter.
# And only if we're not on the test route, since that will already have the user's own number set
if (
step_index == 0 and
template.template_type != 'letter' and
request.endpoint != 'main.send_test_step'
):
session['recipient'] = form.placeholder_value.data session['recipient'] = form.placeholder_value.data
session['placeholders'][current_placeholder] = form.placeholder_value.data session['placeholders'][current_placeholder] = form.placeholder_value.data
@@ -512,10 +518,7 @@ def fields_to_fill_in(template, prefill_current_user=False):
if 'letter' == template.template_type or not prefill_current_user: if 'letter' == template.template_type or not prefill_current_user:
return recipient_columns + list(template.placeholders) return recipient_columns + list(template.placeholders)
session['placeholders'][recipient_columns[0]] = { session['recipient'] = current_user.mobile_number if template.template_type == 'sms' else current_user.mobile_number
'email': current_user.email_address,
'sms': current_user.mobile_number,
}.get(template.template_type)
return list(template.placeholders) return list(template.placeholders)
@@ -590,13 +593,15 @@ def check_notification(service_id, template_id):
# go back to start of process # go back to start of process
back_link = get_back_link(service_id, template_id, 0) back_link = get_back_link(service_id, template_id, 0)
if {'recipient', 'placeholders'} - set(session.keys()) and back_link:
return redirect(back_link)
db_template = service_api_client.get_service_template(service_id, template_id)['data'] db_template = service_api_client.get_service_template(service_id, template_id)['data']
template = get_template( template = get_template(
db_template, db_template,
current_service, current_service,
show_recipient=True, show_recipient=True
letter_preview_url='FUCK WHAT DO I DO HERE'
) )
template.values = session['placeholders'] template.values = session['placeholders']