0001-manager-make-select2-fields-use-direct-widget-refere.patch

Frédéric Péters, 28 mars 2020 15:52

Voir les différences: en ligne côte à côte

Subject: [PATCH] manager: make select2 fields use direct widget references
 (#41017)

Instead of relying on cache.

 src/authentic2/manager/views.py   |  9 +++++++--
 src/authentic2/manager/widgets.py | 26 ++++++++++++++++++++------
 tests/test_manager.py             |  6 ++----
 3 files changed, 29 insertions(+), 12 deletions(-)

     from authentic2.decorators import json as json_view
     from authentic2 import hooks
     from . import app_settings, utils, forms
     from . import app_settings, utils, forms, widgets
     # https://github.com/MongoEngine/django-mongoengine/blob/master/django_mongoengine/views/edit.py
-...
         '''Overrided default django-select2 view to enforce security checks on Select2 AJAX requests.'''
         def get_widget_or_404(self):
             widget = super(Select2View, self).get_widget_or_404()
             field_id = self.kwargs.get('field_id', self.request.GET.get('field_id', None))
             if not field_id or not hasattr(widgets, field_id):
                 raise Http404('Missing or unknown "field_id" provided.')
             widget = getattr(widgets, field_id)()
             widget.queryset = widget.get_queryset()
             widget.view = self
             if hasattr(widget, 'security_check'):
                 if not widget.security_check(self.request, *self.args, **self.kwargs):
                     raise PermissionDenied
             return widget
     select2 = Select2View.as_view()

             return label
     class ChooseUserWidget(SecurityCheckMixin, ModelSelect2Widget):
     class SimpleModelSelect2Widget(ModelSelect2Widget):
         def build_attrs(self, *args, **kwargs):
             attrs = super(SimpleModelSelect2Widget, self).build_attrs(*args, **kwargs)
             attrs['data-field_id'] = self.__class__.__name__
             return attrs
     class SimpleModelSelect2MultipleWidget(ModelSelect2MultipleWidget):
         def build_attrs(self, *args, **kwargs):
             attrs = super(SimpleModelSelect2MultipleWidget, self).build_attrs(*args, **kwargs)
             attrs['data-field_id'] = self.__class__.__name__
             return attrs
     class ChooseUserWidget(SecurityCheckMixin, SimpleModelSelect2Widget):
         model = get_user_model()
         search_fields = [
             'username__icontains', 'first_name__icontains',
-...
             return utils.label_from_user(user)
     class ChooseUsersWidget(SecurityCheckMixin, ModelSelect2MultipleWidget):
     class ChooseUsersWidget(SecurityCheckMixin, SimpleModelSelect2MultipleWidget):
         model = get_user_model()
         search_fields = [
             'username__icontains', 'first_name__icontains',
-...
             return utils.label_from_user(user)
     class ChooseRoleWidget(RoleLabelMixin, SecurityCheckMixin, ModelSelect2Widget):
     class ChooseRoleWidget(RoleLabelMixin, SecurityCheckMixin, SimpleModelSelect2Widget):
         queryset = get_role_model().objects.exclude(slug__startswith='_')
         split_term_operator = operator.__and__
         search_fields = [
-...
+        ]
     class ChooseRolesWidget(RoleLabelMixin, SecurityCheckMixin, ModelSelect2MultipleWidget):
     class ChooseRolesWidget(RoleLabelMixin, SecurityCheckMixin, SimpleModelSelect2MultipleWidget):
         queryset = get_role_model().objects.exclude(slug__startswith='_')
         split_term_operator = operator.__and__
         search_fields = [
-...
+        ]
     class ChooseRolesForChangeWidget(RoleLabelMixin, SecurityCheckMixin, ModelSelect2MultipleWidget):
     class ChooseRolesForChangeWidget(RoleLabelMixin, SecurityCheckMixin, SimpleModelSelect2MultipleWidget):
         operations = ['change']
         queryset = get_role_model().objects.all()
         split_term_operator = operator.__and__
-...
+        ]
     class ChooseUserRoleWidget(RoleLabelMixin, SecurityCheckMixin, ModelSelect2Widget):
     class ChooseUserRoleWidget(RoleLabelMixin, SecurityCheckMixin, SimpleModelSelect2Widget):
         operations = ['change']
         model = get_role_model()
         search_fields = [

     def test_roles_widget(admin, app, db):
         from django.core import signing
         from authentic2.manager.forms import ChooseRoleForm
         login(app, admin, '/manage/')
-...
         form = ChooseRoleForm()
         assert form.as_p()
         field_id = signing.dumps(id(form.fields['role'].widget))
         field_id = form.fields['role'].widget.__class__.__name__
         url = reverse('django_select2-json')
         response = app.get(url, params={'field_id': field_id, 'term': 'Admin'})
         assert len(response.json['results']) == 3
-...
     def test_roles_for_change_widget(admin, app, db):
         from django.core import signing
         from authentic2.manager.forms import RolesForChangeForm
         login(app, admin, '/manage/')
-...
         form = RolesForChangeForm()
         assert form.as_p()
         field_id = signing.dumps(id(form.fields['roles'].widget))
         field_id = form.fields['roles'].widget.__class__.__name__
         url = reverse('django_select2-json')
         response = app.get(url, params={'field_id': field_id, 'term': 'admin'})
         assert len(response.json['results']) == 1
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0001-manager-make-select2-fields-use-direct-widget-refere.patch