From 5794a543852f17cec99eb268fdc0d68071197e24 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Mon, 9 Jul 2018 09:54:54 +0100
Subject: [PATCH] =?UTF-8?q?Rename=20=E2=80=98caseworker=E2=80=99=20to=20?=
 =?UTF-8?q?=E2=80=98basic=20view=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

‘Caseworker’ was a bad name because it:
- suggested that Notify might be expanding into case management
- may or may not map to someone’s actual role, in a confusing way (this
  is why ‘manager’ is also a bad name)

‘Basic view’ is the best name we could come up with because:
- it describes the purpose of feature, not the user
- a ‘view’ changes what you can _see_ as much as it changes what you can
  do

Admin remains a good word – in research users self-describe their use
of Notify in using it. This commit makes the name ‘admin view’ to match
‘basic view’.

This also means we can hide the legend for this fieldset because the
choices are self-explanatory.
---
 app/main/forms.py                                             | 4 ++--
 app/templates/views/manage-users/permissions.html             | 2 +-
 app/templates/views/service-settings.html                     | 2 +-
 .../service_settings/test_service_setting_permissions.py      | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/main/forms.py b/app/main/forms.py
index 12f9625e9..3aeaab095 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -303,8 +303,8 @@ class CaseworkingPermissionsForm(AbstractPermissionsForm):
     user_type = RadioField(
         'User type',
         choices=[
-            ('caseworker', 'Caseworker'),
-            ('admin', 'Admin'),
+            ('caseworker', 'Basic view'),
+            ('admin', 'Admin view'),
         ],
     )
 
diff --git a/app/templates/views/manage-users/permissions.html b/app/templates/views/manage-users/permissions.html
index 7c8fecd23..f6da0ded0 100644
--- a/app/templates/views/manage-users/permissions.html
+++ b/app/templates/views/manage-users/permissions.html
@@ -3,7 +3,7 @@
 
 {% if 'caseworking' in current_service.permissions %}
   <div class="conditional-radios" data-module='conditional-radios'>
-    {% call radios_wrapper(form.user_type) %}
+    {% call radios_wrapper(form.user_type, hide_legend=True) %}
       {% for option in form.user_type %}
 
         <div class="bottom-gutter-1-3">
diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html
index b7294f9af..11f608a41 100644
--- a/app/templates/views/service-settings.html
+++ b/app/templates/views/service-settings.html
@@ -366,7 +366,7 @@
         </li>
         <li class="bottom-gutter">
           <a href="{{ url_for('.service_switch_caseworking', service_id=current_service.id) }}" class="button">
-            {{ 'Stop granting of caseworking permission' if 'caseworking' in current_service.permissions else 'Allow granting of caseworking permission' }}
+            {{ 'Stop basic view' if 'caseworking' in current_service.permissions else 'Allow basic view' }}
           </a>
         </li>
         <li class="bottom-gutter">
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 28a47751e..5fd8b2930 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,9 +45,9 @@ def get_service_settings_page(
         '.service_switch_can_upload_document', {}, 'Allow to upload documents'),
 
     ({'permissions': []},
-        '.service_switch_caseworking', {}, 'Allow granting of caseworking permission'),
+        '.service_switch_caseworking', {}, 'Allow basic view'),
     ({'permissions': ['caseworking']},
-        '.service_switch_caseworking', {}, 'Stop granting of caseworking permission'),
+        '.service_switch_caseworking', {}, 'Stop basic view'),
 
     ({'permissions': ['sms']}, '.service_set_inbound_number', {'set_inbound_sms': True}, 'Allow inbound sms'),