NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-12-21 12:52:21 -06:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Closes #10816: Pass the current request when instantiating a FilterSet within UI views

Browse Source
This commit is contained in:
jeremystretch
2022-11-02 11:00:09 -04:00
parent 0b24d3d892
commit ea61a540cd
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
netbox/netbox/views/generic/bulk_views.py
View File

@@ -126,7 +126,7 @@ class ObjectListView(BaseMultiObjectView, ActionsMixin, TableMixin):
content_type = ContentType.objects.get_for_model(model)
if self.filterset:
self.queryset = self.filterset(request.GET, self.queryset).qs
self.queryset = self.filterset(request.GET, self.queryset, request=request).qs
# Determine the available actions
actions = self.get_permitted_actions(request.user)
@@ -544,7 +544,7 @@ class BulkEditView(GetReturnURLMixin, BaseMultiObjectView):
# If we are editing *all* objects in the queryset, replace the PK list with all matched objects.
if request.POST.get('_all') and self.filterset is not None:
pk_list = self.filterset(request.GET, self.queryset.values_list('pk', flat=True)).qs
pk_list = self.filterset(request.GET, self.queryset.values_list('pk', flat=True), request=request).qs
else:
pk_list = request.POST.getlist('pk')
@@ -741,7 +741,7 @@ class BulkDeleteView(GetReturnURLMixin, BaseMultiObjectView):
if request.POST.get('_all'):
qs = model.objects.all()
if self.filterset is not None:
qs = self.filterset(request.GET, qs).qs
qs = self.filterset(request.GET, qs, request=request).qs
pk_list = qs.only('pk').values_list('pk', flat=True)
else:
pk_list = [int(pk) for pk in request.POST.getlist('pk')]
@@ -828,7 +828,8 @@ class BulkComponentCreateView(GetReturnURLMixin, BaseMultiObjectView):
# Are we editing *all* objects in the queryset or just a selected subset?
if request.POST.get('_all') and self.filterset is not None:
pk_list = [obj.pk for obj in self.filterset(request.GET, self.parent_model.objects.only('pk')).qs]
queryset = self.filterset(request.GET, self.parent_model.objects.only('pk'), request=request).qs
pk_list = [obj.pk for obj in queryset]
else:
pk_list = [int(pk) for pk in request.POST.getlist('pk')]

2
netbox/netbox/views/generic/object_views.py
View File

@@ -126,7 +126,7 @@ class ObjectChildrenView(ObjectView, ActionsMixin, TableMixin):
child_objects = self.get_children(request, instance)
if self.filterset:
child_objects = self.filterset(request.GET, child_objects).qs
child_objects = self.filterset(request.GET, child_objects, request=request).qs
# Determine the available actions
actions = self.get_permitted_actions(request.user, model=self.child_model)