From 116eac60d1022910550c74ec0312331771cb3fa1 Mon Sep 17 00:00:00 2001 From: Imdad Ahad Date: Tue, 25 Apr 2017 16:26:33 +0100 Subject: [PATCH] Handle case where provider does not have international flag --- app/main/views/providers.py | 2 +- app/templates/views/providers/providers.html | 4 ++-- tests/app/main/views/test_providers.py | 11 +++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/main/views/providers.py b/app/main/views/providers.py index 88313c5a2..adf24a697 100644 --- a/app/main/views/providers.py +++ b/app/main/views/providers.py @@ -20,7 +20,7 @@ def view_providers(): for provider in providers: if provider['notification_type'] == 'sms': domestic_sms_providers.append(provider) - if provider['supports_international']: + if provider.get('supports_international', None): intl_sms_providers.append(provider) elif provider['notification_type'] == 'email': domestic_email_providers.append(provider) diff --git a/app/templates/views/providers/providers.html b/app/templates/views/providers/providers.html index 984a55c25..2da7cde9d 100644 --- a/app/templates/views/providers/providers.html +++ b/app/templates/views/providers/providers.html @@ -18,7 +18,7 @@ Providers domestic_sms_providers, caption="Domestic SMS providers", caption_visible=False, - empty_message='No email providers', + empty_message='No domestic sms providers', field_headings=['Provider', 'Priority', 'Active', 'Last Updated', 'Updated By'], field_headings_visible=True ) %} @@ -84,7 +84,7 @@ Providers intl_sms_providers, caption="International SMS providers", caption_visible=False, - empty_message='No email providers', + empty_message='No international sms providers', field_headings=['Provider', 'Priority', 'Active', 'Last Updated', 'Updated By'], field_headings_visible=True ) %} diff --git a/tests/app/main/views/test_providers.py b/tests/app/main/views/test_providers.py index 3bed11fd1..7b847f57d 100644 --- a/tests/app/main/views/test_providers.py +++ b/tests/app/main/views/test_providers.py @@ -73,6 +73,17 @@ stub_providers = { 'created_by': None, 'supports_international': True }, + { + 'id': '67c770f5-918e-4afa-a5ff-880b9beb161d', + 'active': False, + 'priority': 10, + 'display_name': 'International SMS Provider (no flag)', + 'identifier': 'second_sms_international', + 'notification_type': 'sms', + 'updated_at': None, + 'version': 1, + 'created_by': None, + } ] }