Merge remote-tracking branch 'origin/9583-add_column_specific_search_field_to_tables' into 9583-add_column_specific_search_field_to_tables

This commit is contained in:
Daniel Sheppard 2024-02-09 16:37:47 -06:00
commit 3243ebd1dd
2 changed files with 4 additions and 2 deletions

View File

@ -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

View File

@ -7,6 +7,7 @@ __all__ = (
'render_custom_fields',
'render_errors',
'render_field',
'render_filter_field',
'render_form',
'widget_type',
)