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

Remove references to computed service attribute

Browse Source 
`prefix_sms` is the real database column, which should be referred to
from now on.
This commit is contained in:
Chris Hill-Scott
2017-11-07 11:08:26 +00:00
parent 65f20694cc
commit a358acfd05
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/main/views/service_settings.py
View File

@@ -109,8 +109,7 @@ def service_settings(service_id):
default_sms_sender=default_sms_sender, default_sms_sender=default_sms_sender,
sms_sender_count=sms_sender_count, sms_sender_count=sms_sender_count,
free_sms_fragment_limit=free_sms_fragment_limit, free_sms_fragment_limit=free_sms_fragment_limit,
prefix_sms_with_service_name=current_service['prefix_sms_with_service_name'], prefix_sms=current_service['prefix_sms'],
) )
@@ -477,7 +476,7 @@ def service_set_sms(service_id):
def service_set_sms_prefix(service_id): def service_set_sms_prefix(service_id):
form = SMSPrefixForm(enabled=( form = SMSPrefixForm(enabled=(
'on' if current_service['prefix_sms_with_service_name'] else 'off' 'on' if current_service['prefix_sms'] else 'off'
)) ))
form.enabled.label.text = 'Start all text messages with ‘{}:’'.format(current_service['name']) form.enabled.label.text = 'Start all text messages with ‘{}:’'.format(current_service['name'])

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

@@ -94,7 +94,7 @@
{% call row() %} {% call row() %}
{{ text_field('Text messages start with service name') }} {{ text_field('Text messages start with service name') }}
{{ boolean_field(prefix_sms_with_service_name) }} {{ boolean_field(prefix_sms) }}
{{ edit_field('Change', url_for('.service_set_sms_prefix', service_id=current_service.id)) }} {{ edit_field('Change', url_for('.service_set_sms_prefix', service_id=current_service.id)) }}
{% endcall %} {% endcall %}

2
app/utils.py
View File

@@ -288,7 +288,7 @@ def get_template(
return SMSPreviewTemplate( return SMSPreviewTemplate(
template, template,
prefix=service['name'], prefix=service['name'],
sender=not service['prefix_sms_with_service_name'], sender=not service['prefix_sms'],
show_recipient=show_recipient, show_recipient=show_recipient,
redact_missing_personalisation=redact_missing_personalisation, redact_missing_personalisation=redact_missing_personalisation,
) )

6
tests/__init__.py
View File

@@ -56,7 +56,7 @@ def service_json(
permissions=None, permissions=None,
organisation_type='central', organisation_type='central',
free_sms_fragment_limit=250000, free_sms_fragment_limit=250000,
prefix_sms_with_service_name='Treat as None', prefix_sms=True,
): ):
if users is None: if users is None:
users = [] users = []
@@ -64,8 +64,6 @@ def service_json(
permissions = ['email', 'sms'] permissions = ['email', 'sms']
if inbound_api is None: if inbound_api is None:
inbound_api = [] inbound_api = []
if prefix_sms_with_service_name == 'Treat as None':
prefix_sms_with_service_name = (sms_sender == 'GOVUK')
return { return {
'id': id_, 'id': id_,
'name': name, 'name': name,
@@ -86,7 +84,7 @@ def service_json(
'dvla_organisation': '001', 'dvla_organisation': '001',
'permissions': permissions, 'permissions': permissions,
'inbound_api': inbound_api, 'inbound_api': inbound_api,
'prefix_sms_with_service_name': prefix_sms_with_service_name, 'prefix_sms': prefix_sms,
} }