Show all users in folder viewing permissions, correct users checked

app/main/forms.py

@@ -1285,15 +1285,15 @@ class ReturnedLettersForm(StripWhitespaceForm):
 
 
 class TemplateFolderForm(StripWhitespaceForm):
-    def __init__(self, users_with_permission=None, *args, **kwargs):
+    def __init__(self, all_service_users=None, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        if users_with_permission is not None:
-            self.viewing_permissions.users_with_permission = users_with_permission
-            self.viewing_permissions.choices = [
-                (item.id, item.name) for item in users_with_permission
+        if all_service_users is not None:
+            self.users_with_permission.all_service_users = all_service_users
+            self.users_with_permission.choices = [
+                (item.id, item.name) for item in all_service_users
             ]
 
-    viewing_permissions = MultiCheckboxField('Users who can see this folder:')
+    users_with_permission = MultiCheckboxField('Users who can see this folder:')
     name = StringField('Folder name', validators=[DataRequired(message='Can’t be empty')])
 
 

app/main/views/templates.py

@@ -431,19 +431,18 @@ def action_blocked(service_id, notification_type, return_to, template_id):
 @user_has_permissions('manage_templates')
 def manage_template_folder(service_id, template_folder_id):
     current_folder = current_service.get_template_folder(template_folder_id)
-    users_with_folder_permission = [
-        current_service.get_team_member(user_id) for user_id in current_folder['users_with_permission']
-    ]
     form = TemplateFolderForm(
         name=current_folder['name'],
-        users_with_permission=users_with_folder_permission
+        users_with_permission=current_folder.get('users_with_permission', None),
+        all_service_users=[user for user in current_service.active_users if user.id != current_user.id]
     )
     if form.validate_on_submit():
+        users_with_permission = form.users_with_permission.data + [current_user.id]
         template_folder_api_client.update_template_folder(
             current_service.id,
             template_folder_id,
             name=form.name.data,
-            users_with_permission=form.viewing_permissions.data
+            users_with_permission=users_with_permission
         )
         return redirect(
             url_for('.choose_template', service_id=service_id, template_folder_id=template_folder_id)

app/templates/components/checkbox.html

@@ -1,13 +1,12 @@
-{% from "components/select-input.html" import select_nested %}
+{% from "components/select-input.html" import select_nested, select %}
 
 {% macro checkbox(
   field,
   hint=False,
-  width='2-3',
-  value='y'
+  width='2-3'
 ) %}
   <div class="multiple-choice">
-    {{ checkbox_input(field.id, field.name, field.data, value) }}
+    {{ checkbox_input(field.id, field.name, field.data) }}
     <label for="{{ field.id }}">
       {{ field.label.text }}
       {% if hint %}
@@ -21,7 +20,12 @@
 
 
 {% 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") }}
+  {{ select_nested(field, child_map, hint, disable, option_hints, hide_legend, input="checkbox") }}
+{% endmacro %}
+
+
+{% macro checkboxes(field, hint=None, disable=[], option_hints={}, hide_legend=False) %}
+  {{ select(field, hint, disable, option_hints, hide_legend, input="checkbox") }}
 {% endmacro %}
 
 
@@ -40,20 +44,3 @@
     <label></label>
   </div>
 {% endmacro %}
-
-{% macro checkbox_group(
-  legend,
-  fields,
-  set_value=False
-) %}
-  <fieldset class="form-group">
-    <legend class="form-label">
-      {{ legend }}
-    </legend>
-    {% if set_value %}
-      {% for field in fields %}
-        {{ checkbox(field, value=field.data) }}
-      {% endfor %}
-    {% endif %}
-  </fieldset>
-{% endmacro %}

app/templates/views/templates/manage-template-folder.html

@@ -1,7 +1,7 @@
 {% extends "withnav_template.html" %}
 {% from "components/folder-path.html" import folder_path, page_title_folder_path %}
 {% from "components/textbox.html" import textbox %}
-{% from "components/checkbox.html" import checkbox, checkbox_group %}
+{% from "components/checkbox.html" import checkbox, checkboxes %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 
@@ -25,7 +25,7 @@
   {% call form_wrapper(action=url_for('main.manage_template_folder', service_id=current_service.id, template_folder_id=template_folder_id)) %}
     {{ textbox(form.name) }}
     {% if current_service.has_permission("edit_folder_permissions") %}
-      {{ checkbox_group("Users who can see this folder:", form.viewing_permissions, set_value=True) }}
+      {{ checkboxes(form.users_with_permission) }}
     {% endif %}
 
     {{ page_footer(