From 7905b29d64291b7bdce0d034cf3f404fd26bbed9 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Fri, 1 Feb 2019 12:19:10 +0000
Subject: [PATCH] Remove button to toggle folders on/off
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We don’t need it now that everyone has folders.
---
 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  | 4 ----
 4 files changed, 21 deletions(-)

diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py
index 3cd9f5585..f526bcf33 100644
--- a/app/main/views/service_settings.py
+++ b/app/main/views/service_settings.py
@@ -290,14 +290,6 @@ def service_switch_can_upload_document(service_id):
     return render_template('views/service-settings/contact_link.html', form=form)
 
 
-@main.route("/services/<service_id>/service-settings/can-edit-folders")
-@login_required
-@user_is_platform_admin
-def service_switch_can_edit_folders(service_id):
-    current_service.switch_permission('edit_folders')
-    return redirect(url_for('.service_settings', service_id=service_id))
-
-
 @main.route("/services/<service_id>/service-settings/can-choose-postage")
 @login_required
 @user_is_platform_admin
diff --git a/app/navigation.py b/app/navigation.py
index c207e98c3..fc1a57be3 100644
--- a/app/navigation.py
+++ b/app/navigation.py
@@ -241,7 +241,6 @@ class HeaderNavigation(Navigation):
         'service_settings',
         'service_sms_senders',
         'service_switch_can_choose_postage',
-        'service_switch_can_edit_folders',
         'service_switch_can_send_email',
         'service_switch_can_send_precompiled_letter',
         'service_switch_can_upload_document',
@@ -475,7 +474,6 @@ class MainNavigation(Navigation):
         'service_delete_email_reply_to',
         'service_delete_sms_sender',
         'service_switch_can_choose_postage',
-        'service_switch_can_edit_folders',
         'service_switch_can_send_email',
         'service_switch_can_send_precompiled_letter',
         'service_switch_can_upload_document',
@@ -702,7 +700,6 @@ class CaseworkNavigation(Navigation):
         'service_settings',
         'service_sms_senders',
         'service_switch_can_choose_postage',
-        'service_switch_can_edit_folders',
         'service_switch_can_send_email',
         'service_switch_can_send_precompiled_letter',
         'service_switch_can_send_sms',
@@ -937,7 +934,6 @@ class OrgNavigation(Navigation):
         'service_settings',
         'service_sms_senders',
         'service_switch_can_choose_postage',
-        'service_switch_can_edit_folders',
         'service_switch_can_send_email',
         'service_switch_can_send_precompiled_letter',
         'service_switch_can_upload_document',
diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html
index aed9e813e..6db769978 100644
--- a/app/templates/views/service-settings.html
+++ b/app/templates/views/service-settings.html
@@ -383,11 +383,6 @@
              {{ 'Stop uploading documents' if 'upload_document' in current_service.permissions else 'Allow to upload documents' }}
            </a>
         </li>
-        <li class="bottom-gutter">
-           <a href="{{ url_for('.service_switch_can_edit_folders', service_id=current_service.id) }}" class="button">
-             {{ 'Stop editing folders' if 'edit_folders' in current_service.permissions else 'Allow to edit folders' }}
-           </a>
-        </li>
         <li class="bottom-gutter">
            <a href="{{ url_for('.service_switch_can_choose_postage', service_id=current_service.id) }}" class="button">
              {{ 'Stop choosing postage per template' if 'choose_postage' in current_service.permissions else 'Allow to choose postage per template' }}
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 0920e2b72..befb8c325 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
@@ -45,10 +45,6 @@ def get_service_settings_page(
     ({'permissions': []},
         '.service_switch_can_upload_document', {}, 'Allow to upload documents'),
 
-    ({'permissions': ['edit_folders']}, '.service_switch_can_edit_folders', {}, 'Stop editing folders'),
-    ({'permissions': []}, '.service_switch_can_edit_folders', {}, 'Allow to edit folders'),
-
-
     (
         {'permissions': ['choose_postage']},
         '.service_switch_can_choose_postage',