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

Fix ‘Back’ link from first step of fix one off

Browse Source 
If you skip past the templates page (because you don’t have the edit
permission) but then click back you end up in a loop which redirects you
to the page you’re already on.

This commit makes sure that you’re sent back a step further, so you
don’t get stuck in that loop.
This commit is contained in:
Chris Hill-Scott
2018-08-09 16:29:51 +01:00
parent 5b616d55db
commit 5a52eafb84
4 changed files with 53 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,6 +49,7 @@ from app.utils import (
get_errors_for_csv,
get_help_argument,
get_template,
should_skip_template_page,
unicode_truncate,
user_has_permissions,
)
@@ -428,7 +429,7 @@ def send_test_step(service_id, template_id, step_index):
help=get_help_argument(),
))
back_link = get_back_link(service_id, template_id, step_index)
back_link = get_back_link(service_id, template, step_index)
template.values = get_recipient_and_placeholders_from_session(template.template_type)
template.values[current_placeholder] = None
@@ -762,35 +763,36 @@ def get_send_test_page_title(template_type, help_argument, entering_recipient, n
return 'Personalise this message'
def get_back_link(service_id, template_id, step_index):
def get_back_link(service_id, template, step_index):
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 request.endpoint == 'main.check_notification':
return url_for(
'main.send_test',
service_id=service_id,
template_id=template_id,
template_id=template.id,
help=get_help_argument()
)
else:
return None
elif step_index == 0:
if current_user.has_permissions('view_activity'):
return url_for(
'.view_template',
service_id=service_id,
template_id=template_id,
)
else:
if should_skip_template_page(template.template_type):
return url_for(
'.choose_template',
service_id=service_id,
)
else:
return url_for(
'.view_template',
service_id=service_id,
template_id=template.id,
)
else:
return url_for(
'main.send_one_off_step',
service_id=service_id,
template_id=template_id,
template_id=template.id,
step_index=step_index - 1,
)
@@ -818,7 +820,7 @@ def _check_notification(service_id, template_id, exception=None):
sms_sender=sms_sender
)
back_link = get_back_link(service_id, template_id, len(fields_to_fill_in(template)))
back_link = get_back_link(service_id, template, len(fields_to_fill_in(template)))
if (
not session.get('recipient') or