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

Back button on one-off message preview takes user to their flow

Browse Source 
Earlier it always took user to one-off flow, even when they came
from test flow.

Also adjust steps calculation for test flow.
This commit is contained in:
Pea Tyczynska
2018-11-30 10:58:32 +00:00
parent 8653430669
commit b9abeb91d3
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -390,7 +390,11 @@ def send_test_step(service_id, template_id, step_index):
) )
try: try:
current_placeholder = placeholders[step_index] if request.endpoint == 'main.send_test_step':
current_placeholder = placeholders[step_index - 1]
else:
current_placeholder = placeholders[step_index]
except IndexError: except IndexError:
if all_placeholders_in_session(placeholders): if all_placeholders_in_session(placeholders):
return get_notification_check_endpoint(service_id, template) return get_notification_check_endpoint(service_id, template)
@@ -450,7 +454,7 @@ def send_test_step(service_id, template_id, step_index):
): ):
skip_link = ( skip_link = (
'Use my {}'.format(first_column_headings[template.template_type][0]), 'Use my {}'.format(first_column_headings[template.template_type][0]),
url_for('.send_test', service_id=service_id, template_id=template.id), url_for('.send_test_step', service_id=service_id, template_id=template.id, step_index=1),
) )
else: else:
skip_link = None skip_link = None
@@ -798,6 +802,12 @@ def get_send_test_page_title(template_type, help_argument, entering_recipient, n
return 'Personalise this message' return 'Personalise this message'
def is_current_user_the_recipient():
if hasattr(current_user, 'phone_number'):
return session['recipient'] in {current_user.email_address, current_user.phone_number}
return session['recipient'] == current_user.email_address
def get_back_link(service_id, template, step_index): def get_back_link(service_id, template, step_index):
if get_help_argument(): if get_help_argument():
# if we're on the check page, redirect back to the beginning. anywhere else, don't return the back link # if we're on the check page, redirect back to the beginning. anywhere else, don't return the back link
@@ -822,6 +832,13 @@ def get_back_link(service_id, template, step_index):
service_id=service_id, service_id=service_id,
template_id=template.id, template_id=template.id,
) )
elif is_current_user_the_recipient() and step_index > 1:
return url_for(
'main.send_test_step',
service_id=service_id,
template_id=template.id,
step_index=step_index - 1,
)
else: else:
return url_for( return url_for(