diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 924fe67fb2..6e7aa070cc 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -157,6 +157,7 @@ class RegionBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_region' cls = Region queryset = Region.objects.annotate(site_count=Count('sites')) + filter = filters.RegionFilter table = tables.RegionTable default_return_url = 'dcim:region_list' @@ -491,6 +492,7 @@ class RackReservationBulkEditView(PermissionRequiredMixin, BulkEditView): class RackReservationBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_rackreservation' cls = RackReservation + filter = filters.RackReservationFilter table = tables.RackReservationTable default_return_url = 'dcim:rackreservation_list' diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py index d060e53d7c..94b44fc481 100644 --- a/netbox/utilities/views.py +++ b/netbox/utilities/views.py @@ -626,8 +626,11 @@ def post(self, request, **kwargs): return_url = reverse(self.default_return_url) # Are we deleting *all* objects in the queryset or just a selected subset? - if request.POST.get('_all') and self.filter is not None: - pk_list = [obj.pk for obj in self.filter(request.GET, self.cls.objects.only('pk')).qs] + if request.POST.get('_all'): + if self.filter is not None: + pk_list = [obj.pk for obj in self.filter(request.GET, self.cls.objects.only('pk')).qs] + else: + pk_list = self.cls.objects.values_list('pk', flat=True) else: pk_list = [int(pk) for pk in request.POST.getlist('pk')] diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py index a23bc21339..5aef710c14 100644 --- a/netbox/virtualization/views.py +++ b/netbox/virtualization/views.py @@ -160,6 +160,7 @@ class ClusterBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'virtualization.delete_cluster' cls = Cluster queryset = Cluster.objects.all() + filter = filters.ClusterFilter table = tables.ClusterTable default_return_url = 'virtualization:cluster_list'