From 33f318afec7ac31de26870401a8e6952bcbd27ec Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Fri, 1 Feb 2019 12:50:59 +0000 Subject: [PATCH] Remove platform admin toggles for email/SMS Users can do this themselves now. --- app/main/views/service_settings.py | 16 ---------- app/navigation.py | 8 ----- app/templates/views/service-settings.html | 10 ------- .../test_service_setting_permissions.py | 6 ---- tests/app/main/views/test_service_settings.py | 30 ------------------- 5 files changed, 70 deletions(-) diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py index f526bcf33..8db9b838e 100644 --- a/app/main/views/service_settings.py +++ b/app/main/views/service_settings.py @@ -234,22 +234,6 @@ def service_switch_research_mode(service_id): return redirect(url_for('.service_settings', service_id=service_id)) -@main.route("/services//service-settings/can-send-email") -@login_required -@user_is_platform_admin -def service_switch_can_send_email(service_id): - current_service.switch_permission('email') - return redirect(url_for('.service_settings', service_id=service_id)) - - -@main.route("/services//service-settings/can-send-sms") -@login_required -@user_is_platform_admin -def service_switch_can_send_sms(service_id): - current_service.switch_permission('sms') - return redirect(url_for('.service_settings', service_id=service_id)) - - @main.route("/services//service-settings/email-auth") @login_required @user_is_platform_admin diff --git a/app/navigation.py b/app/navigation.py index fc1a57be3..22861f562 100644 --- a/app/navigation.py +++ b/app/navigation.py @@ -241,10 +241,8 @@ class HeaderNavigation(Navigation): 'service_settings', 'service_sms_senders', 'service_switch_can_choose_postage', - 'service_switch_can_send_email', 'service_switch_can_send_precompiled_letter', 'service_switch_can_upload_document', - 'service_switch_can_send_sms', 'service_switch_email_auth', 'service_switch_live', 'service_switch_research_mode', @@ -474,10 +472,8 @@ class MainNavigation(Navigation): 'service_delete_email_reply_to', 'service_delete_sms_sender', 'service_switch_can_choose_postage', - 'service_switch_can_send_email', 'service_switch_can_send_precompiled_letter', 'service_switch_can_upload_document', - 'service_switch_can_send_sms', 'service_switch_email_auth', 'service_switch_live', 'service_switch_research_mode', @@ -700,9 +696,7 @@ class CaseworkNavigation(Navigation): 'service_settings', 'service_sms_senders', 'service_switch_can_choose_postage', - 'service_switch_can_send_email', 'service_switch_can_send_precompiled_letter', - 'service_switch_can_send_sms', 'service_switch_can_upload_document', 'service_switch_email_auth', 'service_switch_live', @@ -934,10 +928,8 @@ class OrgNavigation(Navigation): 'service_settings', 'service_sms_senders', 'service_switch_can_choose_postage', - 'service_switch_can_send_email', 'service_switch_can_send_precompiled_letter', 'service_switch_can_upload_document', - 'service_switch_can_send_sms', 'service_switch_email_auth', 'service_switch_live', 'service_switch_research_mode', diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html index 6db769978..3a2600951 100644 --- a/app/templates/views/service-settings.html +++ b/app/templates/views/service-settings.html @@ -347,16 +347,6 @@ {{ 'Take service out of research mode' if current_service.research_mode else 'Put into research mode' }} -
  • - - {{ 'Stop sending emails' if 'email' in current_service.permissions else 'Allow to send emails' }} - -
  • -
  • - - {{ 'Stop sending sms' if 'sms' in current_service.permissions else 'Allow to send sms' }} - -
  • {% if 'sms' in current_service.permissions %}
  • {% if not current_service.has_permission('inbound_sms') %} diff --git a/tests/app/main/views/service_settings/test_service_setting_permissions.py b/tests/app/main/views/service_settings/test_service_setting_permissions.py index befb8c325..94067c936 100644 --- a/tests/app/main/views/service_settings/test_service_setting_permissions.py +++ b/tests/app/main/views/service_settings/test_service_setting_permissions.py @@ -29,12 +29,6 @@ def get_service_settings_page( ({'research_mode': True}, '.service_switch_research_mode', {}, 'Take service out of research mode'), ({'research_mode': False}, '.service_switch_research_mode', {}, 'Put into research mode'), - ({'permissions': ['email']}, '.service_switch_can_send_email', {}, 'Stop sending emails'), - ({'permissions': []}, '.service_switch_can_send_email', {}, 'Allow to send emails'), - - ({'permissions': ['sms']}, '.service_switch_can_send_sms', {}, 'Stop sending sms'), - ({'permissions': []}, '.service_switch_can_send_sms', {}, 'Allow to send sms'), - ({'permissions': ['letter', 'precompiled_letter']}, '.service_switch_can_send_precompiled_letter', {}, 'Stop sending precompiled letters'), ({'permissions': ['letter']}, diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index 48ba3a810..823757d08 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -1230,36 +1230,6 @@ def test_route_for_platform_admin_update_service( service_one) -@pytest.mark.parametrize('notification_type, permissions_before_switch, permissions_after_switch', [ - ('email', [], ['email']), - ('email', ['email'], []), - ('sms', [], ['sms']), - ('sms', ['sms'], []) -]) -def test_enabling_and_disabling_email_and_sms( - logged_in_platform_admin_client, - service_one, - mocker, - notification_type, - permissions_before_switch, - permissions_after_switch, - mock_get_inbound_number_for_service -): - service_one['permissions'] = permissions_before_switch - mocked_fn = mocker.patch( - 'app.notify_client.service_api_client.service_api_client.update_service', - return_value=service_one, - ) - - response = logged_in_platform_admin_client.get( - url_for('main.service_switch_can_send_{}'.format(notification_type), service_id=service_one['id']) - ) - - assert response.status_code == 302 - assert response.location == url_for('main.service_settings', service_id=service_one['id'], _external=True) - assert mocked_fn.call_args == call(service_one['id'], permissions=permissions_after_switch) - - def test_and_more_hint_appears_on_settings_with_more_than_just_a_single_sender( client_request, service_one,