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

Rewrote some slighlt over complicated logic

Browse Source
This commit is contained in:
Martyn Inglis
2016-08-25 09:15:55 +01:00
parent 9b348880ef
commit c61199d17d
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,14 +78,12 @@ def view_job(service_id, job_id):
filter_args = _parse_filter_args(request.args) filter_args = _parse_filter_args(request.args)
filter_args['status'] = _set_status_filters(filter_args) filter_args['status'] = _set_status_filters(filter_args)
finished = ( total_notifications = job.get('notification_count', 0)
bool(job.get('notification_count', 0) and (( processed_notifications = job.get('notifications_delivered', 0) + job.get('notifications_failed', 0)
job.get('notifications_delivered', 0) +
job.get('notifications_failed', 0)
) == job.get('notification_count', 0))))
return render_template( return render_template(
'views/jobs/job.html', 'views/jobs/job.html',
finished=finished, finished=(total_notifications == processed_notifications),
uploaded_file_name=job['original_file_name'], uploaded_file_name=job['original_file_name'],
template=Template( template=Template(
service_api_client.get_service_template( service_api_client.get_service_template(