Revert "Re-introduce govuk checkboxes"

app/main/views/manage_users.py

@@ -63,7 +63,7 @@ def invite_user(service_id):
             current_user.id,
             service_id,
             email_address,
-            set(form.permissions_field.data),
+            form.permissions,
             form.login_authentication.data,
             form.folder_permissions.data,
         )
@@ -102,7 +102,7 @@ def edit_user_permissions(service_id, user_id):
     if form.validate_on_submit():
         user.set_permissions(
             service_id,
-            permissions=set(form.permissions_field.data),
+            permissions=form.permissions,
             folder_permissions=form.folder_permissions.data,
         )
         if service_has_email_auth:

app/main/views/platform_admin.py

@@ -168,11 +168,9 @@ def platform_admin_services():
         # Default to True if the user hasn’t done any filtering,
         # otherwise respect their choice
         form.include_from_test_key.data = True
-
-    include_from_test_key = form.include_from_test_key.data
     api_args = {'detailed': True,
                 'only_active': False,    # specifically DO get inactive services
-                'include_from_test_key': include_from_test_key,
+                'include_from_test_key': form.include_from_test_key.data,
                 }
 
     if form.start_date.data:
@@ -186,7 +184,7 @@ def platform_admin_services():
 
     return render_template(
         'views/platform-admin/services.html',
-        include_from_test_key=include_from_test_key,
+        include_from_test_key=form.include_from_test_key.data,
         form=form,
         services=list(format_stats_by_service(services)),
         page_title='{} services'.format(