From 13b2eccf4c5888fd7ce096ce9bf2210253a9f25d Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Tue, 20 Oct 2020 14:27:14 +0200 Subject: [PATCH] manager: select default ou in users table (#45338) --- src/authentic2/manager/forms.py | 2 ++ tests/test_user_manager.py | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/src/authentic2/manager/forms.py b/src/authentic2/manager/forms.py index 5dbdcd8e..6937c46c 100644 --- a/src/authentic2/manager/forms.py +++ b/src/authentic2/manager/forms.py @@ -576,6 +576,8 @@ class UserSearchForm(OUSearchForm, CssClass, PrefixFormMixin, FormWithRequest): def __init__(self, *args, **kwargs): self.minimum_chars = kwargs.pop('minimum_chars', 0) + initial = kwargs.setdefault('initial', {}) + initial['ou'] = str(get_default_ou().pk) super(UserSearchForm, self).__init__(*args, **kwargs) def not_enough_chars(self): diff --git a/tests/test_user_manager.py b/tests/test_user_manager.py index 34fbf8b9..c433fc8c 100644 --- a/tests/test_user_manager.py +++ b/tests/test_user_manager.py @@ -335,6 +335,10 @@ def test_user_table(app, admin, user_ou1, ou1): response = login(app, admin, '/manage/users/') assert response.pyquery('td.username') + assert response.pyquery('select#id_search-ou option:selected').val() == str(get_default_ou().pk) + assert admin.username in response.text + assert not user_ou1.username in response.text + # hide all usernames, from specific and general view OU.objects.update(show_username=False) has_show_username.cache.clear() -- 2.20.1