From b140a753217dce6791aa18fef64fdb2bdf336d35 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Thu, 27 Jan 2022 20:06:13 +0100
Subject: [PATCH 1/2] manager: remove ChooseUserForm (#61196)

---
 src/authentic2/manager/forms.py   | 13 -------------
 src/authentic2/manager/widgets.py |  4 ----
 tests/test_manager.py             |  6 ------
 3 files changed, 23 deletions(-)

diff --git a/src/authentic2/manager/forms.py b/src/authentic2/manager/forms.py
index b7400918..a95f95e0 100644
--- a/src/authentic2/manager/forms.py
+++ b/src/authentic2/manager/forms.py
@@ -109,19 +109,6 @@ class LimitQuerysetFormMixin(FormWithRequest):
                 field.queryset = self.request.user.filter_by_perm(perm, qs)
 
 
-class ChooseUserForm(LimitQuerysetFormMixin, CssClass, forms.Form):
-
-    user = fields.ChooseUserField(label=_('Add an user'))
-    action = forms.CharField(initial='add', widget=forms.HiddenInput)
-
-    def __init__(self, *args, **kwargs):
-        ou = kwargs.pop('ou', None)
-        super().__init__(*args, **kwargs)
-        # Filter user by ou if asked
-        if ou:
-            self.fields['user'].queryset = self.fields['user'].queryset.filter(ou=ou)
-
-
 class ChooseRoleForm(LimitQuerysetFormMixin, CssClass, forms.Form):
 
     role = fields.ChooseRoleField(label=_('Add a role'))
diff --git a/src/authentic2/manager/widgets.py b/src/authentic2/manager/widgets.py
index a4265188..a526829d 100644
--- a/src/authentic2/manager/widgets.py
+++ b/src/authentic2/manager/widgets.py
@@ -86,10 +86,6 @@ class SearchUserWidgetMixin(SplitTermMixin):
         return utils.label_from_user(user)
 
 
-class ChooseUserWidget(SearchUserWidgetMixin, SimpleModelSelect2Widget):
-    pass
-
-
 class ChooseUsersWidget(SearchUserWidgetMixin, SimpleModelSelect2MultipleWidget):
     pass
 
diff --git a/tests/test_manager.py b/tests/test_manager.py
index d9230e1d..32e5e996 100644
--- a/tests/test_manager.py
+++ b/tests/test_manager.py
@@ -1011,7 +1011,6 @@ def test_manager_widget_fields_validation(app, simple_user, simple_role):
     '''Verify that fields corresponding to widget implement queryset restrictions.'''
     from authentic2.manager.forms import (
         ChooseRoleForm,
-        ChooseUserForm,
         ChooseUserRoleForm,
         RoleParentForm,
         RolesForm,
@@ -1044,11 +1043,6 @@ def test_manager_widget_fields_validation(app, simple_user, simple_role):
     simple_role.permissions.add(view_user_perm)
     simple_user.roles.add(simple_role)
 
-    form = ChooseUserForm(request=request, data={'user': visible_user.pk, 'action': 'add'})
-    assert form.is_valid()
-    form = ChooseUserForm(request=request, data={'user': forbidden_user.pk, 'action': 'add'})
-    assert error_message in form.errors['user'][0]
-
     form = ChooseRoleForm(request=request, data={'role': visible_role.pk, 'action': 'add'})
     assert form.is_valid()
     form = ChooseRoleForm(request=request, data={'role': forbidden_role.pk, 'action': 'add'})
-- 
2.34.1