Incorporate breaking utils changes

Brings in:
- [ ] https://github.com/alphagov/notifications-utils/pull/94
This commit is contained in:
Chris Hill-Scott
2016-12-08 11:50:59 +00:00
parent ae356fc741
commit dc63de0f4e
16 changed files with 90 additions and 100 deletions

View File

@@ -16,7 +16,6 @@ from flask import (
)
from flask_login import login_required
from werkzeug.datastructures import MultiDict
from notifications_utils.template import Template
from app import (
job_api_client,
@@ -31,7 +30,8 @@ from app.utils import (
generate_previous_dict,
user_has_permissions,
generate_notifications_csv,
get_help_argument
get_help_argument,
get_template,
)
from app.statistics_utils import add_rate_to_job
@@ -108,14 +108,13 @@ def view_job(service_id, job_id):
'views/jobs/job.html',
finished=(total_notifications == processed_notifications),
uploaded_file_name=job['original_file_name'],
template=Template(
template=get_template(
service_api_client.get_service_template(
service_id=service_id,
template_id=job['template'],
version=job['template_version']
)['data'],
prefix=current_service['name'],
sms_sender=current_service['sms_sender']
current_service,
),
status=request.args.get('status', ''),
updates_url=url_for(