darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-02 12:49:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1285 from alphagov/from-always-set

Browse Source 
Use GOVUK as fallback SMS sender
This commit is contained in:
Chris Hill-Scott
2017-05-23 13:55:35 +01:00
committed by GitHub
parent eab15f252b 616fec9d77
commit 1c1c5bd758
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/templates/views/service-settings.html
View File

@@ -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 %}

2
app/utils.py
View File

@@ -278,7 +278,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']:

4
tests/app/main/views/test_service_settings.py
View File

@@ -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',