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

Change None to Not set

Browse Source 
‘None’ is a bit Pythony. ‘Not set’ is a bit more human.
This commit is contained in:
Chris Hill-Scott
2017-10-05 11:23:17 +01:00
parent 521b5b6cf1
commit 8cc8a0bf05
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,12 +73,12 @@ def service_settings(service_id):
reply_to_email_addresses = service_api_client.get_reply_to_email_addresses(service_id)
reply_to_email_address_count = len(reply_to_email_addresses)
default_reply_to_email_address = next(
(x['email_address'] for x in reply_to_email_addresses if x['is_default']), "None"
(x['email_address'] for x in reply_to_email_addresses if x['is_default']), "Not set"
)
letter_contact_details = service_api_client.get_letter_contacts(service_id)
letter_contact_details_count = len(letter_contact_details)
default_letter_contact_block = next(
(Field(x['contact_block'], html='escape') for x in letter_contact_details if x['is_default']), "None"
(Field(x['contact_block'], html='escape') for x in letter_contact_details if x['is_default']), "Not set"
)
return render_template(
'views/service-settings.html',

2
app/templates/components/table.html
View File

@@ -92,7 +92,7 @@
{% endcall %}
{%- endmacro %}
{% macro optional_text_field(text, default=None) -%}
{% macro optional_text_field(text, default='Not set') -%}
{{ text_field(
text or default,
status='' if text else 'default'

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

@@ -135,8 +135,8 @@
{% if 'letter' in current_service.permissions %}
{% call row() %}
{{ text_field('Sender addresses') }}
{% call field(status='default' if default_letter_contact_block == "None" else '') %}
{{ default_letter_contact_block | string | nl2br | safe if default_letter_contact_block else 'None'}}
{% call field(status='default' if default_letter_contact_block == "Not set" else '') %}
{{ default_letter_contact_block | string | nl2br | safe if default_letter_contact_block else 'Not set'}}
{% if letter_contact_details_count > 1 %}
<div class="hint">
{{ '…and %d more' | format(letter_contact_details_count - 1) }}

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

@@ -34,7 +34,7 @@ from tests.conftest import (
'Label Value Action',
'Send emails On Change',
'Email reply to addresses None Change',
'Email reply to addresses Not set Change',
'Label Value Action',
'Send text messages On Change',
@@ -53,7 +53,7 @@ from tests.conftest import (
'Label Value Action',
'Send emails On Change',
'Email reply to addresses None Change',
'Email reply to addresses Not set Change',
'Label Value Action',
'Send text messages On Change',
@@ -115,7 +115,7 @@ def test_should_show_overview(
'Text message sender 0781239871',
'International text messages On Change',
'Receive text messages On Change',
'API endpoint for received text messages None Change',
'API endpoint for received text messages Not set Change',
'Label Value Action',
'Send letters Off Change',
@@ -252,7 +252,7 @@ def test_letter_contact_block_shows_none_if_not_set(
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
div = page.find_all('tr')[8].find_all('td')[1].div
assert div.text.strip() == 'None'
assert div.text.strip() == 'Not set'
assert 'default' in div.attrs['class'][0]