From 0219594eb72787d66df1b443ae1c7f08c2f4489a Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Mon, 2 Aug 2021 16:18:51 +0200 Subject: [PATCH 1/3] manager: factorize SHOW_ALL_OU default value (#53481) --- src/authentic2/manager/forms.py | 2 +- src/authentic2/manager/user_views.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/authentic2/manager/forms.py b/src/authentic2/manager/forms.py index 996b5846..dbef3854 100644 --- a/src/authentic2/manager/forms.py +++ b/src/authentic2/manager/forms.py @@ -411,7 +411,7 @@ class OUSearchForm(FormWithRequest): # - hide ou field all_ou_label = kwargs.pop('all_ou_label', pgettext('organizational unit', 'All')) self.queryset = kwargs.pop('queryset', None) - self.show_all_ou = kwargs.pop('show_all_ou', True) + self.show_all_ou = kwargs.pop('show_all_ou', app_settings.SHOW_ALL_OU) self.show_none_ou = kwargs.pop('show_none_ou', True) request = kwargs['request'] self.ou_count = utils.get_ou_count() diff --git a/src/authentic2/manager/user_views.py b/src/authentic2/manager/user_views.py index 4a6d0972..731d16c8 100644 --- a/src/authentic2/manager/user_views.py +++ b/src/authentic2/manager/user_views.py @@ -108,7 +108,6 @@ class UsersView(HideOUColumnMixin, BaseTableView): def get_search_form_kwargs(self): kwargs = super().get_search_form_kwargs() kwargs['minimum_chars'] = app_settings.USER_SEARCH_MINIMUM_CHARS - kwargs['show_all_ou'] = app_settings.SHOW_ALL_OU return kwargs def filter_by_search(self, qs): @@ -703,7 +702,6 @@ class UserRolesView(HideOUColumnMixin, BaseSubTableView): kwargs['all_ou_label'] = '' kwargs['user'] = self.object kwargs['role_members_from_ou'] = app_settings.ROLE_MEMBERS_FROM_OU - kwargs['show_all_ou'] = app_settings.SHOW_ALL_OU kwargs['queryset'] = self.request.user.filter_by_perm( 'a2_rbac.view_role', get_role_model().objects.all() ) -- 2.20.1