From 616fec9d771c45e55522c094d658cda49c5cc1d5 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Mon, 22 May 2017 15:10:16 +0100 Subject: [PATCH] Remove 40604 as fallback We should just be using whatever is in the database. Should not be merged until the DB migration is done. --- app/templates/views/service-settings.html | 2 +- app/utils.py | 2 +- tests/app/main/views/test_service_settings.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html index b133d1aa6..153069c93 100644 --- a/app/templates/views/service-settings.html +++ b/app/templates/views/service-settings.html @@ -36,7 +36,7 @@ {% call row() %} {{ text_field('Text message sender') }} - {{ text_field(current_service.sms_sender or '40604') }} + {{ text_field(current_service.sms_sender or 'GOVUK') }} {{ edit_field('Change', url_for('.service_set_sms_sender', service_id=current_service.id)) }} {% endcall %} diff --git a/app/utils.py b/app/utils.py index c345643f0..a74c6227b 100644 --- a/app/utils.py +++ b/app/utils.py @@ -269,7 +269,7 @@ def get_template( return SMSPreviewTemplate( template, prefix=service['name'], - sender=service['sms_sender'], + sender=(service['sms_sender'] not in {'GOVUK', None}), show_recipient=show_recipient ) if 'letter' == template['template_type']: diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index 9ac91dddd..85dfa69c6 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -19,7 +19,7 @@ from tests.conftest import active_user_with_permissions, platform_admin_user 'Label Value Action', 'Service name service one Change', 'Email reply to address None Change', - 'Text message sender 40604 Change', + 'Text message sender GOVUK Change', 'International text messages Off Change', 'Letters Off Change', ]), @@ -27,7 +27,7 @@ from tests.conftest import active_user_with_permissions, platform_admin_user 'Label Value Action', 'Service name service one Change', 'Email reply to address None Change', - 'Text message sender 40604 Change', + 'Text message sender GOVUK Change', 'International text messages Off Change', 'Letters Off Change', 'Label Value Action',