darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-05-27 09:29:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #928 from alphagov/rationalise-configs

Browse Source 
Simplified the config files for admin.
This commit is contained in:
minglis
2016-09-08 10:27:45 +01:00
committed by GitHub
parent d46bfaba14 130698f720
commit 2ea401213e
4 changed files with 22 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,23 +242,6 @@ def view_notifications(service_id, message_type):
)
@main.route("/services/<service_id>/jobs/<job_id>/notification/<string:notification_id>")
@login_required
@user_has_permissions('view_activity', admin_override=True)
def view_notification(service_id, job_id, notification_id):
now = time.strftime('%H:%M')
return render_template(
'views/notification.html',
message=[
message for message in messages if message['id'] == notification_id
][0],
delivered_at=now,
uploaded_at=now,
job_id=job_id
)
def get_status_filters(service, message_type, statistics):
stats = statistics[message_type]
stats['sending'] = stats['requested'] - stats['delivered'] - stats['failed']
@@ -307,20 +290,20 @@ def _get_job_counts(job, help_argument):
count
) for label, query_param, count in [
[
'total', '',
job.get('notification_count', 0)
'total', '',
job.get('notification_count', 0)
],
[
'sending', 'sending',
sending
'sending', 'sending',
sending
],
[
'delivered', 'delivered',
job.get('notifications_delivered', 0)
'delivered', 'delivered',
job.get('notifications_delivered', 0)
],
[
'failed', 'failed',
job.get('notifications_failed', 0)
'failed', 'failed',
job.get('notifications_failed', 0)
]
]
]