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

Prefix text messages with service name

Browse Source 
Brings in: https://github.com/alphagov/notifications-utils/pull/4
This commit is contained in:
Chris Hill-Scott
2016-02-26 09:33:45 +00:00
parent 70ef2f5a6f
commit 2f91848a42
5 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/main/views/jobs.py
View File

@@ -58,7 +58,8 @@ def view_job(service_id, job_id):
uploaded_file_name=job['original_file_name'],
uploaded_file_time=job['created_at'],
template=Template(
templates_dao.get_service_template_or_404(service_id, job['template'])['data']
templates_dao.get_service_template_or_404(service_id, job['template'])['data'],
prefix=service['name']
),
service_id=service_id,
service=service

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

@@ -51,7 +51,10 @@ def choose_template(service_id, template_type):
return render_template(
'views/choose-template.html',
templates=[
Template(template) for template in templates_dao.get_service_templates(service_id)['data']
Template(
template,
prefix=service['name']
) for template in templates_dao.get_service_templates(service_id)['data']
if template['template_type'] == template_type
],
template_type=template_type,
@@ -84,7 +87,8 @@ 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']
templates_dao.get_service_template_or_404(service_id, template_id)['data'],
prefix=service['name']
)
return render_template(
@@ -155,7 +159,8 @@ def check_messages(service_id, upload_id):
template = Template(
raw_template,
values=upload_result['rows'][0] if upload_result['valid'] else {},
drop_values={'to'}
drop_values={'to'},
prefix=service['name']
)
return render_template(
'views/check.html',