diff --git a/app/main/forms.py b/app/main/forms.py index 4feae2ab6..9340c3ba4 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1726,11 +1726,14 @@ class TemplateFolderForm(StripWhitespaceForm): def __init__(self, all_service_users=None, *args, **kwargs): super().__init__(*args, **kwargs) if all_service_users is not None: - self.users_with_permission.all_service_users = all_service_users + regular_users = [user for user in all_service_users if not user.platform_admin] + platform_admins = [user for user in all_service_users if user.platform_admin] + + self.users_with_permission.all_service_users = regular_users self.users_with_permission.choices = [ - (item.id, f"{item.name} (admin)" if item.platform_admin else item.name) - for item in all_service_users + (item.id, item.name) for item in regular_users ] + self.platform_admins = platform_admins users_with_permission = USWDSCollapsibleCheckboxesField( "Team members who can see this folder", field_label="team member" diff --git a/app/templates/views/templates/manage-template-folder.html b/app/templates/views/templates/manage-template-folder.html index b72760e5d..493db0d21 100644 --- a/app/templates/views/templates/manage-template-folder.html +++ b/app/templates/views/templates/manage-template-folder.html @@ -27,6 +27,14 @@ }) }} {% if current_user.has_permissions(ServicePermission.MANAGE_SERVICE) and form.users_with_permission.all_service_users %} {{ form.users_with_permission }} + {% if form.platform_admins is defined and form.platform_admins %} +
Platform administrators can see all folders and cannot be removed from folders:
+