From fd7a33d0a6592aad7ffa25e5d0d0b0cbfd048ff4 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Fri, 17 May 2019 13:06:26 +0100
Subject: [PATCH 1/3] Remove folder permissions feature flag from team members

---
 app/templates/views/manage-users.html     | 2 +-
 tests/app/main/views/test_manage_users.py | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/templates/views/manage-users.html b/app/templates/views/manage-users.html
index e915f5ba4..32926b8ef 100644
--- a/app/templates/views/manage-users.html
+++ b/app/templates/views/manage-users.html
@@ -58,7 +58,7 @@
               </div>
             {% endif %}
             {# only show if the service has folders #}
-            {% if current_service.has_permission('edit_folder_permissions')  and current_service.all_template_folders %}
+            {% if current_service.all_template_folders %}
               <div class="tick-cross-list-hint">
                 {% set folder_count = user.template_folders_for_service(current_service) | length %}
 
diff --git a/tests/app/main/views/test_manage_users.py b/tests/app/main/views/test_manage_users.py
index f11df5df0..965243222 100644
--- a/tests/app/main/views/test_manage_users.py
+++ b/tests/app/main/views/test_manage_users.py
@@ -124,6 +124,7 @@ def test_should_show_overview_page(
     client_request,
     mocker,
     mock_get_invites_for_service,
+    mock_get_template_folders,
     mock_has_no_jobs,
     fake_uuid,
     service_one,
@@ -157,6 +158,7 @@ def test_should_show_caseworker_on_overview_page(
     client_request,
     mocker,
     mock_get_invites_for_service,
+    mock_get_template_folders,
     fake_uuid,
     service_one,
 ):
@@ -276,6 +278,7 @@ def test_manage_users_page_shows_member_auth_type_if_service_has_email_auth_acti
     service_one,
     mock_get_users_by_service,
     mock_get_invites_for_service,
+    mock_get_template_folders,
     displays_auth_type
 ):
     if service_has_email_auth:
@@ -833,6 +836,7 @@ def test_manage_users_shows_invited_user(
     client_request,
     mocker,
     active_user_with_permissions,
+    mock_get_template_folders,
     sample_invite,
     invite_status,
     expected_text,
@@ -852,6 +856,7 @@ def test_manage_users_does_not_show_accepted_invite(
     mocker,
     active_user_with_permissions,
     sample_invite,
+    mock_get_template_folders,
 ):
     invited_user_id = uuid.uuid4()
     sample_invite['id'] = invited_user_id
@@ -897,6 +902,7 @@ def test_no_permission_manage_users_page(
     service_one,
     mock_get_users_by_service,
     mock_get_invites_for_service,
+    mock_get_template_folders,
     api_user_active,
     mocker,
 ):
@@ -997,6 +1003,7 @@ def test_can_invite_user_as_platform_admin(
     platform_admin_user,
     active_user_with_permissions,
     mock_get_invites_for_service,
+    mock_get_template_folders,
     mocker,
 ):
     mocker.patch('app.user_api_client.get_users_for_service', return_value=[active_user_with_permissions])

From 1f601cd80789e3b023cc817b24e310e2eb096540 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Fri, 17 May 2019 13:07:07 +0100
Subject: [PATCH 2/3] Remove feature from from user model

---
 app/models/user.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/models/user.py b/app/models/user.py
index f74046eb0..84a4b339e 100644
--- a/app/models/user.py
+++ b/app/models/user.py
@@ -168,9 +168,6 @@ class User(UserMixin):
         """
         Returns list of template folders that a user can view for a given service
         """
-        if not service.has_permission('edit_folder_permissions'):
-            return service.all_template_folders
-
         return [
             template_folder
             for template_folder in service.all_template_folders

From 5a0bba22eefd21e63b4a46cb3d70b08468925592 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Fri, 17 May 2019 13:07:35 +0100
Subject: [PATCH 3/3] Swap folder permissions and sign in method

This makes the order match what is shown on the individual team members
page.
---
 app/templates/views/manage-users.html | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/templates/views/manage-users.html b/app/templates/views/manage-users.html
index 32926b8ef..a69a908e0 100644
--- a/app/templates/views/manage-users.html
+++ b/app/templates/views/manage-users.html
@@ -48,15 +48,6 @@
                 label
               ) }}
             {% endfor %}
-            {% if current_service.has_permission('email_auth') %}
-              <div class="tick-cross-list-hint">
-                {% if user.auth_type == 'sms_auth' %}
-                  Signs in with a text message code
-                {% else %}
-                  Signs in with an email link
-                {% endif %}
-              </div>
-            {% endif %}
             {# only show if the service has folders #}
             {% if current_service.all_template_folders %}
               <div class="tick-cross-list-hint">
@@ -71,6 +62,15 @@
                 {% endif%}
               </div>
             {% endif %}
+            {% if current_service.has_permission('email_auth') %}
+              <div class="tick-cross-list-hint">
+                {% if user.auth_type == 'sms_auth' %}
+                  Signs in with a text message code
+                {% else %}
+                  Signs in with an email link
+                {% endif %}
+              </div>
+            {% endif %}
           </div>
           {% if current_user.has_permissions('manage_service') %}
             <li class="tick-cross-list-edit-link">