Merge branch 'master' into fix-permissions

This commit is contained in:
Rebecca Law
2016-03-30 09:32:24 +01:00
11 changed files with 146 additions and 59 deletions

View File

@@ -59,12 +59,7 @@
{% set global_header_text = "GOV.UK Notify" %}
{% if not current_user.is_authenticated() %}
{% set homepage_url = url_for('main.index') %}
{% else %}
{% set homepage_url = url_for('main.choose_service') %}
{% endif %}
{% set homepage_url = url_for('main.show_all_services_or_dashboard') %}
{% block content %}
<div id="content">

View File

@@ -64,7 +64,7 @@
{% if errors %}
{{file_upload(form.file, button_text='Re-upload your file')}}
{% else %}
<form method="post" enctype="multipart/form-data">
<form method="post" enctype="multipart/form-data" action="{{url_for('main.start_job', service_id=service_id, upload_id=upload_id)}}">
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
<input type="submit" class="button" value="{{ send_button_text }}" />
<a href="{{url_for('.send_messages', service_id=service_id, template_id=template.id)}}" class="page-footer-back-link">Back</a>