darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-05 02:42:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

After sending sms or email to self or batch then then back button

Browse Source 
does not take user to check page, but rather the start of sending
either sms or email.
This commit is contained in:
Adam Shimali
2016-03-29 15:59:53 +01:00
parent 0ac16dd5ff
commit f3fd5f6b15
3 changed files with 20 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,6 +98,12 @@ def choose_template(service_id, template_type):
@user_has_permissions('send_texts', 'send_emails', 'send_letters')
def send_messages(service_id, template_id):
service = services_dao.get_service_by_id_or_404(service_id)
template = Template(
templates_dao.get_service_template_or_404(service_id, template_id)['data'],
prefix=service['name']
)
form = CsvUploadForm()
if form.validate_on_submit():
try:
@@ -117,18 +123,13 @@ def send_messages(service_id, template_id):
}
return redirect(url_for('.check_messages',
service_id=service_id,
upload_id=upload_id))
upload_id=upload_id,
template_type=template.template_type))
except ValueError as e:
flash('There was a problem uploading: {}'.format(form.file.data.filename))
flash(str(e))
return redirect(url_for('.send_messages', service_id=service_id, template_id=template_id))
service = services_dao.get_service_by_id_or_404(service_id)
template = Template(
templates_dao.get_service_template_or_404(service_id, template_id)['data'],
prefix=service['name']
)
return render_template(
'views/send.html',
template=template,
@@ -184,12 +185,14 @@ def send_message_to_self(service_id, template_id):
'data': output.getvalue()
}
upload_id = str(uuid.uuid4())
s3upload(upload_id, service_id, filedata, current_app.config['AWS_REGION'])
session['upload_data'] = {"template_id": template_id, "original_file_name": filedata['file_name']}
return redirect(url_for('.check_messages',
service_id=service_id,
upload_id=upload_id))
upload_id=upload_id,
template_type=template.template_type))
@main.route("/services/<service_id>/send/<template_id>/from-api", methods=['GET'])
@@ -214,10 +217,13 @@ def send_from_api(service_id, template_id):
)
@main.route("/services/<service_id>/check/<upload_id>", methods=['GET'])
@main.route("/services/<service_id>/<template_type>/check/<upload_id>", methods=['GET'])
@login_required
@user_has_permissions('send_texts', 'send_emails', 'send_letters')
def check_messages(service_id, upload_id):
def check_messages(service_id, template_type, upload_id):
if not session.get('upload_data'):
return redirect(url_for('main.choose_template', service_id=service_id, template_type=template_type))
service = services_dao.get_service_by_id_or_404(service_id)
@@ -266,11 +272,12 @@ def check_messages(service_id, upload_id):
send_button_text=get_send_button_text(template.template_type, session['upload_data']['notification_count']),
service_id=service_id,
service=service,
upload_id=upload_id,
form=CsvUploadForm()
)
@main.route("/services/<service_id>/check/<upload_id>", methods=['POST'])
@main.route("/services/<service_id>/start-job/<upload_id>", methods=['POST'])
@login_required
@user_has_permissions('send_texts', 'send_emails', 'send_letters')
def start_job(service_id, upload_id):

2
app/templates/views/check.html
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>