From 3f524546912f06d6519a669335bdf6fcf4972e94 Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Wed, 14 Feb 2018 17:09:13 +0000 Subject: [PATCH] Remove allow/stop send pdf letters button. Now that we only use the pdf letter flow, we can remove the button for the platform admin users. --- app/main/views/service_settings.py | 8 -------- app/templates/views/service-settings.html | 7 ------- .../service_settings/test_service_setting_permissions.py | 6 ------ 3 files changed, 21 deletions(-) diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py index 5739892e2..55d4fa246 100644 --- a/app/main/views/service_settings.py +++ b/app/main/views/service_settings.py @@ -265,14 +265,6 @@ def update_service_permissions(service_id, permissions, sms_sender=None): service_api_client.update_service_with_properties(service_id, data) -@main.route("/services//service-settings/send-letters-as-pdf") -@login_required -@user_has_permissions(admin_override=True) -def service_switch_send_letters_as_pdf(service_id): - switch_service_permissions(service_id, 'letters_as_pdf') - return redirect(url_for('.service_settings', service_id=service_id)) - - @main.route("/services//service-settings/can-send-email") @login_required @user_has_permissions(admin_override=True) diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html index 641f1f7fb..ba872382c 100644 --- a/app/templates/views/service-settings.html +++ b/app/templates/views/service-settings.html @@ -310,13 +310,6 @@ {{ 'Stop sending emails' if 'email' in current_service.permissions else 'Allow to send emails' }} - {% if 'letter' in current_service.permissions %} -
  • - - {{ 'Stop sending letters as PDF' if 'letters_as_pdf' in current_service.permissions else 'Send letters as PDF' }} - -
  • - {% endif %}
  • {{ 'Stop sending sms' if 'sms' in current_service.permissions else 'Allow to send 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 3762871a7..57a6cdcf1 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 @@ -37,12 +37,6 @@ def get_service_settings_page( ({'permissions': ['sms']}, '.service_set_inbound_number', {'set_inbound_sms': True}, 'Allow inbound sms'), - ( - {'permissions': ['letter', 'letters_as_pdf']}, - '.service_switch_send_letters_as_pdf', {}, 'Stop sending letters as PDF' - ), - ({'permissions': ['letter']}, '.service_switch_send_letters_as_pdf', {}, 'Send letters as PDF'), - ({'active': True}, '.archive_service', {}, 'Archive service'), ({'active': True}, '.suspend_service', {}, 'Suspend service'), ({'active': False}, '.resume_service', {}, 'Resume service'),