diff --git a/app/__init__.py b/app/__init__.py index e2f4a6f2b..d4211a033 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -111,6 +111,7 @@ def create_app(): application.add_template_filter(format_date_normal) application.add_template_filter(format_date_short) application.add_template_filter(format_notification_status) + application.add_template_filter(format_notification_status_as_field_status) application.after_request(useful_headers_after_request) application.after_request(save_service_after_request) @@ -250,6 +251,17 @@ def format_notification_status(status, template_type): }.get(template_type).get(status, status) +def format_notification_status_as_field_status(status): + return { + 'failed': 'error', + 'technical-failure': 'error', + 'temporary-failure': 'error', + 'permanent-failure': 'error', + 'delivered': None, + 'sending': 'default' + }.get(status, 'error') + + @login_manager.user_loader def load_user(user_id): return user_api_client.get_user(user_id) diff --git a/app/templates/views/notifications.html b/app/templates/views/notifications.html index ff70f7cc6..c42216def 100644 --- a/app/templates/views/notifications.html +++ b/app/templates/views/notifications.html @@ -68,7 +68,7 @@ (item.updated_at or item.created_at)|format_datetime_short ) }} - {% call field(status='', align='right') %} + {% call field(status=item.status|format_notification_status_as_field_status, align='right') %} {{ item.status|format_notification_status(item.template.template_type) }} {% endcall %}