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

Remove 40604 as fallback

Browse Source 
We should just be using whatever is in the database. Should not be
merged until the DB migration is done.
This commit is contained in:
Chris Hill-Scott
2017-05-22 15:10:16 +01:00
parent eb7b8631b6
commit 616fec9d77
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() %} {% call row() %}
{{ text_field('Text message sender') }} {{ 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)) }} {{ edit_field('Change', url_for('.service_set_sms_sender', service_id=current_service.id)) }}
{% endcall %} {% endcall %}

2
app/utils.py
View File

@@ -269,7 +269,7 @@ def get_template(
return SMSPreviewTemplate( return SMSPreviewTemplate(
template, template,
prefix=service['name'], prefix=service['name'],
sender=service['sms_sender'], sender=(service['sms_sender'] not in {'GOVUK', None}),
show_recipient=show_recipient show_recipient=show_recipient
) )
if 'letter' == template['template_type']: 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', 'Label Value Action',
'Service name service one Change', 'Service name service one Change',
'Email reply to address None Change', 'Email reply to address None Change',
'Text message sender 40604 Change', 'Text message sender GOVUK Change',
'International text messages Off Change', 'International text messages Off Change',
'Letters Off Change', 'Letters Off Change',
]), ]),
@@ -27,7 +27,7 @@ from tests.conftest import active_user_with_permissions, platform_admin_user
'Label Value Action', 'Label Value Action',
'Service name service one Change', 'Service name service one Change',
'Email reply to address None Change', 'Email reply to address None Change',
'Text message sender 40604 Change', 'Text message sender GOVUK Change',
'International text messages Off Change', 'International text messages Off Change',
'Letters Off Change', 'Letters Off Change',
'Label Value Action', 'Label Value Action',