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

Merge branch 'master' into template_history_view

Browse Source 
Conflicts:
	requirements.txt
This commit is contained in:
Rebecca Law
2016-05-13 17:30:33 +01:00
parent 64e7a7b010 cccf2c4590
commit fcf277c413
10 changed files with 133 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,7 @@ def view_jobs(service_id):
@user_has_permissions('view_activity', admin_override=True)
def view_job(service_id, job_id):
job = job_api_client.get_job(service_id, job_id)['data']
template = service_api_client.get_service_template(service_id, job['template'])['data']
template = service_api_client.get_service_template(service_id, job['template'], job['template_version'])['data']
notifications = notification_api_client.get_notifications_for_service(service_id, job_id)
finished = job['status'] == 'finished'
return render_template(

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

@@ -175,7 +175,7 @@ def send_test(service_id, template_id):
get_example_csv_rows(template, use_example_as_example=False, submitted_fields=request.form)
])
filedata = {
'file_name': 'Test run',
'file_name': 'Test message',
'data': output.getvalue()
}
upload_id = str(uuid.uuid4())