From f257f4aad401d23d4d758619b46446967cbe1462 Mon Sep 17 00:00:00 2001
From: Daniel Sheppard <dans@dansheps.com>
Date: Thu, 21 Mar 2024 22:18:34 -0500
Subject: [PATCH] Apply suggestions from code review

Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>
---
 netbox/netbox/views/generic/bulk_views.py              | 5 ++---
 netbox/templates/inc/table_header_filter_dropdown.html | 3 ++-
 netbox/templates/inc/table_htmx.html                   | 8 ++++----
 netbox/utilities/templatetags/form_helpers.py          | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

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 %}
 <div class="column-filter dropdown">
-    <a href="#" classs="btn dropdown-toggle" data-bs-toggle="dropdown" data-bs-auto-close="outside">
+    <a href="#" class="btn dropdown-toggle" data-bs-toggle="dropdown" data-bs-auto-close="outside">
+
         <i class="mdi mdi-filter-settings" style="font-size: 1.25rem;"> </i>
     </a>
     <div class="dropdown-menu">
diff --git a/netbox/templates/inc/table_htmx.html b/netbox/templates/inc/table_htmx.html
index 0366207a3..fc8ca313e 100644
--- a/netbox/templates/inc/table_htmx.html
+++ b/netbox/templates/inc/table_htmx.html
@@ -17,8 +17,8 @@
                   ><i class="mdi mdi-close"></i></a>
                 </div>
               {% endif %}
-              {%  if table.filterset_form %}
-                {% include 'inc/table_header_filter_dropdown.html' with form_field=table.filterset_form|getfilterfield:column.name %}
+              {% if table.filterset_form %}
+                {% include 'inc/table_header_filter_dropdown.html' with form_field=table.filterset_form|get_filter_field:column.name %}
               {% endif %}
               <a href="#"
                  hx-get="{{ table.htmx_url }}{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}"
@@ -28,8 +28,8 @@
             </th>
           {% else %}
             <th {{ column.attrs.th.as_html }}>
-              {%  if table.filterset_form %}
-                {% include 'inc/table_header_filter_dropdown.html' with form_field=table.filterset_form|getfilterfield:column.name %}
+              {% if table.filterset_form %}
+                {% include 'inc/table_header_filter_dropdown.html' with form_field=table.filterset_form|get_filter_field:column.name %}
               {% endif %}
               {{ column.header }}
             </th>
diff --git a/netbox/utilities/templatetags/form_helpers.py b/netbox/utilities/templatetags/form_helpers.py
index e93415c6a..2240d77ee 100644
--- a/netbox/utilities/templatetags/form_helpers.py
+++ b/netbox/utilities/templatetags/form_helpers.py
@@ -6,7 +6,7 @@ from utilities.forms.rendering import FieldSet, InlineFields, ObjectAttribute, T
 
 __all__ = (
     'getfield',
-    'getfilterfield',
+    'get_filter_field',
     'render_custom_fields',
     'render_errors',
     'render_field',
@@ -35,7 +35,7 @@ def getfield(form, fieldname):
 
 
 @register.filter()
-def getfilterfield(form, fieldname):
+def get_filter_field(form, fieldname):
     field = getfield(form, f'{fieldname}')
     if field is not None:
         return field