From 2f40ddae2080f442f5cc65e51af93fdb3f097e51 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 10 Jul 2018 10:09:17 +0100 Subject: [PATCH] Remove platform admin toggle for basic view Since platform admins can use the new settings page, this commit: - links to that page - removes the platform-admin-only endpoint that switches basic view on and off --- app/main/views/service_settings.py | 8 -------- app/navigation.py | 4 ---- app/templates/views/service-settings.html | 5 +++-- .../service_settings/test_service_setting_permissions.py | 5 ----- 4 files changed, 3 insertions(+), 19 deletions(-) diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py index 1034004ef..f44763a06 100644 --- a/app/main/views/service_settings.py +++ b/app/main/views/service_settings.py @@ -323,14 +323,6 @@ def service_switch_email_auth(service_id): return redirect(url_for('.service_settings', service_id=service_id)) -@main.route("/services//service-settings/caseworking") -@login_required -@user_is_platform_admin -def service_switch_caseworking(service_id): - switch_service_permissions(service_id, 'caseworking') - return redirect(url_for('.service_settings', service_id=service_id)) - - @main.route("/services//service-settings/can-send-precompiled-letter") @login_required @user_is_platform_admin diff --git a/app/navigation.py b/app/navigation.py index c71237ad5..122e3f6f3 100644 --- a/app/navigation.py +++ b/app/navigation.py @@ -230,7 +230,6 @@ class HeaderNavigation(Navigation): 'service_switch_can_send_precompiled_letter', 'service_switch_can_upload_document', 'service_switch_can_send_sms', - 'service_switch_caseworking', 'service_switch_email_auth', 'service_switch_live', 'service_switch_research_mode', @@ -450,7 +449,6 @@ class MainNavigation(Navigation): 'service_switch_can_send_precompiled_letter', 'service_switch_can_upload_document', 'service_switch_can_send_sms', - 'service_switch_caseworking', 'service_switch_email_auth', 'service_switch_live', 'service_switch_research_mode', @@ -658,7 +656,6 @@ class CaseworkNavigation(Navigation): 'service_switch_can_send_precompiled_letter', 'service_switch_can_send_sms', 'service_switch_can_upload_document', - 'service_switch_caseworking', 'service_switch_email_auth', 'service_switch_live', 'service_switch_research_mode', @@ -880,7 +877,6 @@ class OrgNavigation(Navigation): 'service_switch_can_send_precompiled_letter', 'service_switch_can_upload_document', 'service_switch_can_send_sms', - 'service_switch_caseworking', '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 cc27cc59d..8aa628d4d 100644 --- a/app/templates/views/service-settings.html +++ b/app/templates/views/service-settings.html @@ -365,8 +365,8 @@
  • - - {{ 'Stop basic view' if 'caseworking' in current_service.permissions else 'Allow basic view' }} + + Set basic view
  • @@ -397,3 +397,4 @@ {% endif %} {% endblock %} +} 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 5fd8b2930..40b3b85a7 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 @@ -44,11 +44,6 @@ def get_service_settings_page( ({'permissions': []}, '.service_switch_can_upload_document', {}, 'Allow to upload documents'), - ({'permissions': []}, - '.service_switch_caseworking', {}, 'Allow basic view'), - ({'permissions': ['caseworking']}, - '.service_switch_caseworking', {}, 'Stop basic view'), - ({'permissions': ['sms']}, '.service_set_inbound_number', {'set_inbound_sms': True}, 'Allow inbound sms'), ({'active': True}, '.archive_service', {}, 'Archive service'),