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

Fixed merge conflicts with master.

Browse Source 
Code quality fixes.
This commit is contained in:
Nicholas Staples
2016-03-30 10:26:01 +01:00
parent 1a8d4fda69
commit ff9d3d72ad
5 changed files with 21 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/main/views/jobs.py
+1 -2
View File
@@ -16,7 +16,6 @@ from utils.template import Template
from app import (job_api_client, notification_api_client, service_api_client)
from app.main import main
from app.main.dao import templates_dao
from app.utils import (
get_page_from_request,
generate_previous_next_dict,
@@ -41,7 +40,7 @@ def view_jobs(service_id):
def view_job(service_id, job_id):
service = service_api_client.get_service(service_id)['data']
job = job_api_client.get_job(service_id, job_id)['data']
template = templates_dao.get_service_template_or_404(service_id, job['template'])['data']
template = service_api_client.get_service_template(service_id, job['template'])['data']
notifications = notification_api_client.get_notifications_for_service(service_id, job_id)
finished = job['status'] == 'finished'
return render_template(