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

Merge branch 'master' into fix-permissions

Browse Source
This commit is contained in:
Rebecca Law
2016-03-30 09:32:24 +01:00
parent eb72c6e5bf 3e16fc1962
commit 1cfaeec7b2
11 changed files with 146 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,8 +26,10 @@ from app.main.uploader import (
s3download
)
from app.main.dao import templates_dao
from app.main.dao import services_dao
from app import job_api_client
from app import (
job_api_client,
service_api_client
)
from app.utils import user_has_permissions, get_errors_for_csv
@@ -74,7 +76,7 @@ def get_page_headings(template_type):
admin_override=True, or_=True)
def choose_template(service_id, template_type):
service = services_dao.get_service_by_id_or_404(service_id)
service = service_api_client.get_service(service_id)['data']
if template_type not in ['email', 'sms']:
abort(404)
@@ -102,6 +104,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 = service_api_client.get_service(service_id)['data']
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:
@@ -121,18 +129,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,
@@ -188,12 +191,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'])
@@ -218,12 +223,15 @@ 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):
service = services_dao.get_service_by_id_or_404(service_id)
if not session.get('upload_data'):
return redirect(url_for('main.choose_template', service_id=service_id, template_type=template_type))
service = service_api_client.get_service(service_id)['data']
contents = s3download(service_id, upload_id)
if not contents:
@@ -270,17 +278,18 @@ 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):
upload_data = session['upload_data']
services_dao.get_service_by_id_or_404(service_id)
service = service_api_client.get_service(service_id)['data']
if request.files or not upload_data.get('valid'):
# The csv was invalid, validate the csv again