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

Merge pull request #443 from alphagov/fix-activity-for-new-api

Browse Source 
Make activity page use new nomenclature for status
This commit is contained in:
Chris Hill-Scott
2016-04-13 17:16:25 +01:00
parent 7272791c54 9b4933f16b
commit 85f2bf92ac
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,7 +119,7 @@ def view_notifications(service_id):
service_id=service_id, service_id=service_id,
page=page, page=page,
template_type=filter_args.getlist('template_type') if 'template_type' in filter_args else None, template_type=filter_args.getlist('template_type') if 'template_type' in filter_args else None,
status=filter_args.getlist('status') if 'status' in filter_args else None) status=filter_args.getlist('status') if 'status' in filter_args else ['delivered', 'failed'])
view_dict = MultiDict(request.args) view_dict = MultiDict(request.args)
prev_page = None prev_page = None
if notifications['links'].get('prev', None): if notifications['links'].get('prev', None):
@@ -157,7 +157,7 @@ def view_notifications(service_id):
'.view_notifications', '.view_notifications',
service_id=current_service['id'], service_id=current_service['id'],
template_type=item[1], template_type=item[1],
status=request.args.get('status', '') status=request.args.get('status', 'delivered,failed')
)] for item in [ )] for item in [
['Emails', 'email'], ['Emails', 'email'],
['Text messages', 'sms'], ['Text messages', 'sms'],
@@ -171,9 +171,9 @@ def view_notifications(service_id):
template_type=request.args.get('template_type', ''), template_type=request.args.get('template_type', ''),
status=item[1] status=item[1]
)] for item in [ )] for item in [
['Successful', 'sent,delivered'], ['Successful', 'delivered'],
['Failed', 'failed,complaint,bounce'], ['Failed', 'failed'],
['Both', ''] ['Both', 'delivered,failed']
] ]
] ]
) )

2
app/templates/main_nav.html
View File

@@ -4,7 +4,7 @@
</h2> </h2>
<ul> <ul>
{% if current_user.has_permissions(['view_activity'], admin_override=True) %} {% if current_user.has_permissions(['view_activity'], admin_override=True) %}
<li><a href="{{ url_for('.view_notifications', service_id=current_service.id, page=1) }}">Activity</a></li> <li><a href="{{ url_for('.view_notifications', service_id=current_service.id, status='delivered,failed') }}">Activity</a></li>
{% endif %} {% endif %}
{% if current_user.has_permissions(['view_activity', 'manage_templates', 'manage_api_keys'], admin_override=True, any_=True) %} {% if current_user.has_permissions(['view_activity', 'manage_templates', 'manage_api_keys'], admin_override=True, any_=True) %}
<li><a href="{{ url_for('.choose_template', service_id=current_service.id, template_type='sms') }}">Text message templates</a></li> <li><a href="{{ url_for('.choose_template', service_id=current_service.id, template_type='sms') }}">Text message templates</a></li>

6
app/templates/views/notifications.html
View File

@@ -12,13 +12,13 @@
<h1 class="heading-large"> <h1 class="heading-large">
{%- if (request_args.get('template_type', '') == '') and (request_args.get('status', '') == '') -%} {%- if (request_args.get('template_type', '') == '') and (request_args.get('status', 'delivered,failed') == 'delivered,failed') -%}
Activity Activity
{%- else -%} {%- else -%}
{% if request_args.get('status') != '' %} {% if request_args.get('status') != 'delivered,failed' %}
{% for label, option, _ in status_filters %} {% for label, option, _ in status_filters %}
{% if request_args.get('status') == option %} {% if request_args.get('status') == option %}
{{ label }} {{ label }}
@@ -32,7 +32,7 @@
{% for template_label, template_option, _ in type_filters %} {% for template_label, template_option, _ in type_filters %}
{% if request_args.get('template_type') == template_option %} {% if request_args.get('template_type') == template_option %}
{% if request_args.get('status', '') == '' %} {% if request_args.get('status', 'delivered,failed') == 'delivered,failed' %}
{{ template_label }} {{ template_label }}
{% else %} {% else %}
{{ template_label | lower }} {{ template_label | lower }}