From 882aa30043ce2eba609fbd7902e942aa0ed0e7dc Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Mon, 20 Jan 2025 12:06:26 -0600 Subject: [PATCH] Simplify filter generation --- netbox/netbox/views/generic/bulk_views.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/netbox/netbox/views/generic/bulk_views.py b/netbox/netbox/views/generic/bulk_views.py index 6f4608730..6804f56e2 100644 --- a/netbox/netbox/views/generic/bulk_views.py +++ b/netbox/netbox/views/generic/bulk_views.py @@ -178,18 +178,10 @@ class ObjectListView(BaseMultiObjectView, ActionsMixin, TableMixin): # * Apply to the table for use by the table and initialize a separate instance of the form for use by the table # column filters # * Otherwise set to None - if self.filterset_form and table.filterset_form: + if self.filterset_form: filterset_form = self.filterset_form(request.GET) - table.filterset_form = table.filterset_form(request.GET) - elif self.filterset_form and not table.filterset_form: - filterset_form = self.filterset_form(request.GET) - table.filterset_form = self.filterset_form(request.GET) - elif not self.filterset_form and table.filterset_form: - filterset_form = None - table.filterset_form = table.filterset_form(request.GET) else: filterset_form = None - table.filterset_form = None # If this is an HTMX request, return only the rendered table HTML if htmx_partial(request):