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

Merge pull request #3006 from alphagov/fix-placeholder-collection-order-send-test

Browse Source 
Fix order of steps in send/send test journeys
This commit is contained in:
Chris Hill-Scott
2019-06-06 16:42:42 +01:00
committed by GitHub
parent 486976a091 7cc8fcfb2d
commit 8034d7ecc2
2 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -386,10 +386,7 @@ def send_test_step(service_id, template_id, step_index):
)
try:
if request.endpoint == 'main.send_test_step':
current_placeholder = placeholders[step_index - 1]
else:
current_placeholder = placeholders[step_index]
current_placeholder = placeholders[step_index]
except IndexError:
if all_placeholders_in_session(placeholders):
return get_notification_check_endpoint(service_id, template)
@@ -449,7 +446,7 @@ def send_test_step(service_id, template_id, step_index):
):
skip_link = (
'Use my {}'.format(first_column_headings[template.template_type][0]),
url_for('.send_test_step', service_id=service_id, template_id=template.id, step_index=1),
url_for('.send_test', service_id=service_id, template_id=template.id),
)
else:
skip_link = None