From cc423f5071dfa995eb5bf182ec4cfadd62c0f536 Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Wed, 7 Feb 2024 13:48:32 -0600 Subject: [PATCH] Apply some quick fixes and add comments --- netbox/netbox/views/generic/bulk_views.py | 5 +++-- netbox/utilities/templatetags/form_helpers.py | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/netbox/netbox/views/generic/bulk_views.py b/netbox/netbox/views/generic/bulk_views.py index 406ff049d..f2b62f7a8 100644 --- a/netbox/netbox/views/generic/bulk_views.py +++ b/netbox/netbox/views/generic/bulk_views.py @@ -160,9 +160,10 @@ class ObjectListView(BaseMultiObjectView, ActionsMixin, TableMixin): # Render the objects table table = self.get_table(self.queryset, request, has_bulk_actions) - filterset_form = self.filterset_form(request.GET, label_suffix='') if self.filterset_form else None - + # 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'): + filterset_form = self.filterset_form(request.GET, label_suffix='') table.filterset_form = filterset_form # If this is an HTMX request, return only the rendered table HTML diff --git a/netbox/utilities/templatetags/form_helpers.py b/netbox/utilities/templatetags/form_helpers.py index 1bd01f38a..f2b3f8b3f 100644 --- a/netbox/utilities/templatetags/form_helpers.py +++ b/netbox/utilities/templatetags/form_helpers.py @@ -7,6 +7,7 @@ __all__ = ( 'render_custom_fields', 'render_errors', 'render_field', + 'render_filter_field', 'render_form', 'widget_type', )