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

Say manage if there’s more than none

Browse Source 
‘Change’ as a label for the link is misleading, because this is also the
page you go to in order to get the ID of a given reply to address.
‘Manage’ feels a bit more general.
This commit is contained in:
Chris Hill-Scott
2017-09-26 16:00:13 +01:00
parent b68784207b
commit c78fac911a
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,7 +44,7 @@
{% if 'email' in current_service.permissions %} {% if 'email' in current_service.permissions %}
{% call row() %} {% call row() %}
{{ text_field('Email reply to address') }} {{ text_field('Email reply to addresses') }}
{% call field(status='default' if default_reply_to_email_address == "None" else '') %} {% call field(status='default' if default_reply_to_email_address == "None" else '') %}
{{ default_reply_to_email_address }} {{ default_reply_to_email_address }}
@@ -54,7 +54,10 @@
</div> </div>
{% endif %} {% endif %}
{% endcall %} {% endcall %}
{{ edit_field('Change', url_for('.service_email_reply_to', service_id=current_service.id)) }} {{ edit_field(
'Manage' if reply_to_email_address_count else 'Change',
url_for('.service_email_reply_to', service_id=current_service.id))
}}
{% endcall %} {% endcall %}
{% endif %} {% endif %}

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

@@ -31,7 +31,7 @@ from tests.conftest import (
'Label Value Action', 'Label Value Action',
'Send emails On Change', 'Send emails On Change',
'Email reply to address None Change', 'Email reply to addresses None Change',
'Label Value Action', 'Label Value Action',
'Send text messages On Change', 'Send text messages On Change',
@@ -50,7 +50,7 @@ from tests.conftest import (
'Label Value Action', 'Label Value Action',
'Send emails On Change', 'Send emails On Change',
'Email reply to address None Change', 'Email reply to addresses None Change',
'Label Value Action', 'Label Value Action',
'Send text messages On Change', 'Send text messages On Change',
@@ -102,7 +102,7 @@ def test_should_show_overview(
'Label Value Action', 'Label Value Action',
'Send emails On Change', 'Send emails On Change',
'Email reply to address test@example.com Change', 'Email reply to addresses test@example.com Manage',
'Label Value Action', 'Label Value Action',
'Send text messages On Change', 'Send text messages On Change',
@@ -121,7 +121,7 @@ def test_should_show_overview(
'Label Value Action', 'Label Value Action',
'Send emails On Change', 'Send emails On Change',
'Email reply to address test@example.com Change', 'Email reply to addresses test@example.com Manage',
'Label Value Action', 'Label Value Action',
'Send text messages On Change', 'Send text messages On Change',
@@ -686,7 +686,7 @@ def test_reply_to_hint_appears_when_service_has_multiple_reply_to_addresses(
assert normalize_spaces( assert normalize_spaces(
page.select('tbody tr')[2].text page.select('tbody tr')[2].text
) == "Email reply to address test@example.com …and 2 more Change" ) == "Email reply to addresses test@example.com …and 2 more Manage"
def test_default_email_reply_to_address_has_default_hint( def test_default_email_reply_to_address_has_default_hint(