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

Added if admin check to remove row in service settings (#621)

Browse Source
This commit is contained in:
Andrew Shumway
2023-07-28 09:17:02 -06:00
committed by GitHub
parent 242c7acd34
commit abf06247d2
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,8 +62,9 @@
)}} )}}
{% endcall %} {% endcall %}
{% if current_user.platform_admin %}
{% call settings_row(if_has_permission='sms') %} {% call settings_row(if_has_permission='sms') %}
{{ text_field('Text message senders') }} {{ text_field('Text message senders\n(Only visible to Platform Admins)') }}
{% call field(status='default' if current_service.default_sms_sender == "None" else '') %} {% call field(status='default' if current_service.default_sms_sender == "None" else '') %}
{{ current_service.default_sms_sender | nl2br if current_service.default_sms_sender else 'None'}} {{ current_service.default_sms_sender | nl2br if current_service.default_sms_sender else 'None'}}
{% if current_service.count_sms_senders > 1 %} {% if current_service.count_sms_senders > 1 %}
@@ -80,6 +81,7 @@
) )
}} }}
{% endcall %} {% endcall %}
{% endif %}
{% call settings_row(if_has_permission='sms') %} {% call settings_row(if_has_permission='sms') %}
{{ text_field('Start text messages with service name') }} {{ text_field('Start text messages with service name') }}

6
tests/app/main/views/service_settings/test_service_settings.py
View File

@@ -57,7 +57,6 @@ def mock_get_service_settings_page_common(
'Service name Test Service Change service name', 'Service name Test Service Change service name',
'Sign-in method Text message code Change sign-in method', 'Sign-in method Text message code Change sign-in method',
'Send text messages On Change your settings for sending text messages', 'Send text messages On Change your settings for sending text messages',
'Text message senders GOVUK Manage text message senders',
'Start text messages with service name On Change your settings for starting text messages with service name', 'Start text messages with service name On Change your settings for starting text messages with service name',
'Send international text messages Off Change your settings for sending international text messages', 'Send international text messages Off Change your settings for sending international text messages',
@@ -68,7 +67,7 @@ def mock_get_service_settings_page_common(
'Service name Test Service Change service name', 'Service name Test Service Change service name',
'Sign-in method Text message code Change sign-in method', 'Sign-in method Text message code Change sign-in method',
'Send text messages On Change your settings for sending text messages', 'Send text messages On Change your settings for sending text messages',
'Text message senders GOVUK Manage text message senders', 'Text message senders (Only visible to Platform Admins) GOVUK Manage text message senders',
'Start text messages with service name On Change your settings for starting text messages with service name', 'Start text messages with service name On Change your settings for starting text messages with service name',
'Send international text messages Off Change your settings for sending international text messages', 'Send international text messages Off Change your settings for sending international text messages',
@@ -111,7 +110,6 @@ def test_should_show_overview(
page = client_request.get( page = client_request.get(
'main.service_settings', service_id=SERVICE_ONE_ID 'main.service_settings', service_id=SERVICE_ONE_ID
) )
assert page.find('h1').text == 'Settings' assert page.find('h1').text == 'Settings'
rows = page.select('tr') rows = page.select('tr')
assert len(rows) == len(expected_rows) assert len(rows) == len(expected_rows)
@@ -205,7 +203,6 @@ def test_send_files_by_email_row_on_settings_page(
'Service name service one Change service name', 'Service name service one Change service name',
'Sign-in method Text message code Change sign-in method', 'Sign-in method Text message code Change sign-in method',
'Send text messages On Change your settings for sending text messages', 'Send text messages On Change your settings for sending text messages',
'Text message senders GOVUK Manage text message senders',
'Start text messages with service name On Change your settings for starting text messages with service name', 'Start text messages with service name On Change your settings for starting text messages with service name',
'Send international text messages On Change your settings for sending international text messages', 'Send international text messages On Change your settings for sending international text messages',
@@ -216,7 +213,6 @@ def test_send_files_by_email_row_on_settings_page(
'Service name service one Change service name', 'Service name service one Change service name',
'Sign-in method Email link or text message code Change sign-in method', 'Sign-in method Email link or text message code Change sign-in method',
'Send text messages On Change your settings for sending text messages', 'Send text messages On Change your settings for sending text messages',
'Text message senders GOVUK Manage text message senders',
'Start text messages with service name On Change your settings for starting text messages with service name', 'Start text messages with service name On Change your settings for starting text messages with service name',
'Send international text messages Off Change your settings for sending international text messages', 'Send international text messages Off Change your settings for sending international text messages',