diff --git a/netbox/netbox/views/generic/bulk_views.py b/netbox/netbox/views/generic/bulk_views.py index bfdb6d670..cf07797dd 100644 --- a/netbox/netbox/views/generic/bulk_views.py +++ b/netbox/netbox/views/generic/bulk_views.py @@ -162,9 +162,8 @@ class ObjectListView(BaseMultiObjectView, ActionsMixin, TableMixin): table = self.get_table(self.queryset, request, has_bulk_actions) # Check for filterset_form on this view, if a form exists, apply to context and table, otherwise set to None - filterset_form = None - if hasattr(self, 'filterset_form') and self.filterset_form: - filterset_form = self.filterset_form(request.GET, label_suffix='') + if self.filterset_form: + filterset_form = self.filterset_form(request.GET) table.filterset_form = filterset_form # If this is an HTMX request, return only the rendered table HTML diff --git a/netbox/templates/inc/table_header_filter_dropdown.html b/netbox/templates/inc/table_header_filter_dropdown.html index 020ba6d4d..4e76bcb54 100644 --- a/netbox/templates/inc/table_header_filter_dropdown.html +++ b/netbox/templates/inc/table_header_filter_dropdown.html @@ -1,7 +1,8 @@ {% load form_helpers %} {% if form_field %}