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

letter branding text fields should be optional

Browse Source
This commit is contained in:
Leo Hemsted
2019-02-05 17:21:09 +00:00
parent 5405c2e1be
commit d5446774fa
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -232,7 +232,7 @@
{% call settings_row(if_has_permission='letter') %} {% call settings_row(if_has_permission='letter') %}
{{ text_field('Letter branding') }} {{ text_field('Letter branding') }}
{{ text_field(current_service.letter_branding) }} {{ optional_text_field(current_service.letter_branding.name) }}
{{ edit_field( {{ edit_field(
'Change', 'Change',
url_for('.request_letter_branding', service_id=current_service.id), url_for('.request_letter_branding', service_id=current_service.id),
@@ -309,7 +309,7 @@
{% endcall %} {% endcall %}
{% call row() %} {% call row() %}
{{ text_field('Letter branding')}} {{ text_field('Letter branding')}}
{{ text_field(current_service.letter_branding.name) }} {{ optional_text_field(current_service.letter_branding.name) }}
{{ edit_field('Change', url_for('.service_set_letter_branding', service_id=current_service.id)) }} {{ edit_field('Change', url_for('.service_set_letter_branding', service_id=current_service.id)) }}
{% endcall %} {% endcall %}
{% call row() %} {% call row() %}

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

@@ -94,7 +94,7 @@ def mock_get_service_settings_page_common(
'Organisation type Central Change', 'Organisation type Central Change',
'Free text message allowance 250,000 Change', 'Free text message allowance 250,000 Change',
'Email branding GOV.UK Change', 'Email branding GOV.UK Change',
'Letter branding Change', 'Letter branding Not set Change',
'Data retention email Change' 'Data retention email Change'
]), ]),
@@ -186,7 +186,7 @@ def test_should_show_overview(
'Label Value Action', 'Label Value Action',
'Send letters On Change', 'Send letters On Change',
'Sender addresses 1 Example Street Manage', 'Sender addresses 1 Example Street Manage',
'Letter branding None Change', 'Letter branding Not set Change',
]), ]),
]) ])