Display nested folders permissions form on user permissions page

We're reusing the logic for the `move_to` nested radios field for the
user folder permissions nested checkboxes.

The main difference between the two forms (aside from the different
input type) is that "Move" form contains the root "Templates" as an
option, whereas the folder permissions doesn't.

It turns out that, because of the way NestedFieldMixin.children and
select_nested macro are implemented the easiest way to get the desired
folder permissions behaviour is to add the root folder as a choice with
a `None` value and `NONE_OPTION_VALUE = None` set on the field, which
allows the `child_map` to be constructed but doesn't display the root
folder checkbox itself since it gets overwritten in the final `child_map`.

app/main/forms.py

@@ -418,6 +418,15 @@ PermissionsAbstract = type("PermissionsAbstract", (StripWhitespaceForm,), {
 
 
 class PermissionsForm(PermissionsAbstract):
+    def __init__(self, all_template_folders=None, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if all_template_folders:
+            self.folder_permissions.all_template_folders = all_template_folders
+            self.folder_permissions.choices = [
+                (item['id'], item['name']) for item in ([{'name': 'Templates', 'id': None}] + all_template_folders)
+            ]
+
+    folder_permissions = NestedCheckboxesField('Folder permissions')
 
     login_authentication = RadioField(
         'Sign in using',
@@ -437,8 +446,9 @@ class PermissionsForm(PermissionsAbstract):
         return (getattr(self, permission) for permission, _ in permissions)
 
     @classmethod
-    def from_user(cls, user, service_id):
+    def from_user(cls, user, service_id, **kwargs):
         return cls(
+            **kwargs,
             **{
                 role: user.has_permission_for_service(service_id, role)
                 for role in roles.keys()

app/main/views/manage_users.py

@@ -84,7 +84,11 @@ def edit_user_permissions(service_id, user_id):
     if user.mobile_number:
         mobile_number = redact_mobile_number(user.mobile_number, " ")
 
-    form = PermissionsForm.from_user(user, service_id)
+    form = PermissionsForm.from_user(
+        user,
+        service_id,
+        all_template_folders=current_service.all_template_folders
+    )
 
     if form.validate_on_submit():
         user_api_client.set_user_permissions(

app/templates/components/checkbox.html

@@ -1,3 +1,5 @@
+{% from "components/select-input.html" import select_nested %}
+
 {% macro checkbox(
   field,
   hint=False,
@@ -17,6 +19,11 @@
 {% endmacro %}
 
 
+{% macro checkboxes_nested(field, child_map, hint=None, disable=[], option_hints={}, hide_legend=False) %}
+  {{ select_nested(field, child_map, hint=None, disable=[], option_hints={}, hide_legend=False, input="checkbox") }}
+{% endmacro %}
+
+
 {% macro checkbox_input(id, name, data=None, value="y") %}
   <input
     id="{{ id }}" name="{{ name }}" type="checkbox" value="{{ value }}"

app/templates/components/radios.html

@@ -1,27 +1,22 @@
-{% from "components/select-input.html" import select, select_list, select_nested, select_wrapper %}
+{% from "components/select-input.html" import select, select_list, select_nested, select_wrapper, select_input %}
 
 {% macro radios(field, hint=None, disable=[], option_hints={}, hide_legend=False) %}
-  {{ select(field, hint=None, disable=[], option_hints={}, hide_legend=False, input="radio") }}
+  {{ select(field, hint, disable, option_hints, hide_legend, input="radio") }}
 {% endmacro %}
 
 
 {% macro radio_list(options, child_map, disable=[], option_hints={}) %}
-  {{ select_list(options, child_map, disable=[], option_hints={}, input="radio") }}
+  {{ select_list(options, child_map, disable, option_hints, input="radio") }}
 {% endmacro %}
 
 
 {% macro radios_nested(field, child_map, hint=None, disable=[], option_hints={}, hide_legend=False) %}
-  {{ select_nested(field, child_map, hint=None, disable=[], option_hints={}, hide_legend=False, input="radio") }}
-{% endmacro %}
-
-
-{% macro radios_wrapper(field, hint=None, disable=[], option_hints={}, hide_legend=False) %}
-  {{ select_wrapper(field, hint=None, disable=[], option_hints={}, hide_legend=False, input="radio") }}
+  {{ select_nested(field, child_map, hint, disable, option_hints, hide_legend, input="radio") }}
 {% endmacro %}
 
 
 {% macro radio(option, disable=[], option_hints={}, data_target=None, as_list_item=False) %}
-  {{ select_input(option, disable=[], option_hints={}, data_target=None, as_list_item=False, input="radio") }}
+  {{ select_input(option, disable, option_hints, data_target, as_list_item, input="radio") }}
 {% endmacro %}
 
 

app/templates/views/manage-users/permissions.html

@@ -1,5 +1,5 @@
-{% from "components/checkbox.html" import checkbox %}
-{% from "components/radios.html" import radio, radios, radios_wrapper, conditional_radio_panel %}
+{% from "components/checkbox.html" import checkbox, checkboxes_nested %}
+{% from "components/radios.html" import radio, radios, conditional_radio_panel %}
 
 <fieldset class="form-group">
   <legend class="form-label">
@@ -14,6 +14,10 @@
   All team members can see sent messages.
 </p>
 
+{% if current_service.has_permission("edit_folder_permissions") %}
+  {{ checkboxes_nested(form.folder_permissions, form.folder_permissions.children()) }}
+{% endif %}
+
 {% if service_has_email_auth %}
   {% if not mobile_number %}
     {{ radios(

app/templates/views/service-settings/contact_link.html

@@ -1,7 +1,8 @@
 {% extends "withnav_template.html" %}
 {% from "components/textbox.html" import textbox %}
 {% from "components/page-footer.html" import page_footer %}
-{% from "components/radios.html" import radio, radios_wrapper %}
+{% from "components/radios.html" import radio %}
+{% from "components/select-input.html" import select_wrapper %}
 {% from "components/form.html" import form_wrapper %}
 
 {% block service_page_title %}
@@ -21,7 +22,7 @@
       </p>
       {% call form_wrapper() %}
 
-        {% call radios_wrapper(form.contact_details_type, hide_legend=true) %}
+        {% call select_wrapper(form.contact_details_type, hide_legend=true) %}
           {% for option in form.contact_details_type %}
             {% set data_target = option.data.replace('_', '-') ~ "-type" %}