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

Factor out skip link to reduce complexity

Browse Source 
The code was too complex and Flake8 was complaining.

While this code isn’t related to the change we’re making it is easy
enough to factor out.
This commit is contained in:
Chris Hill-Scott
2020-04-09 16:37:38 +01:00
parent d31c244363
commit f773a6ed71
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -524,19 +524,6 @@ def send_test_step(service_id, template_id, step_index):
template.values = get_recipient_and_placeholders_from_session(template.template_type)
template.values[current_placeholder] = None
if (
request.endpoint == 'main.send_one_off_step'
and step_index == 0
and template.template_type != 'letter'
and not (template.template_type == 'sms' and current_user.mobile_number is None)
and current_user.has_permissions('manage_templates', 'manage_service')
):
skip_link = (
'Use my {}'.format(first_column_headings[template.template_type][0]),
url_for('.send_test', service_id=service_id, template_id=template.id),
)
else:
skip_link = None
return render_template(
'views/send-test.html',
page_title=get_send_test_page_title(
@@ -547,7 +534,7 @@ def send_test_step(service_id, template_id, step_index):
),
template=template,
form=form,
skip_link=skip_link,
skip_link=get_skip_link(step_index, template),
back_link=back_link,
help=get_help_argument(),
link_to_upload=(
@@ -989,6 +976,20 @@ def get_back_link(service_id, template, step_index, placeholders=None):
)
def get_skip_link(step_index, template):
if (
request.endpoint == 'main.send_one_off_step'
and step_index == 0
and template.template_type != 'letter'
and not (template.template_type == 'sms' and current_user.mobile_number is None)
and current_user.has_permissions('manage_templates', 'manage_service')
):
return (
'Use my {}'.format(first_column_headings[template.template_type][0]),
url_for('.send_test', service_id=current_service.id, template_id=template.id),
)
@main.route("/services/<uuid:service_id>/template/<uuid:template_id>/notification/check", methods=['GET'])
@user_has_permissions('send_messages', restrict_admin_usage=True)
def check_notification(service_id, template_id):