NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-28 03:16:25 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Apply suggestions from code review

Browse Source 
Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>
This commit is contained in:
Daniel Sheppard 2024-03-21 22:18:34 -05:00 committed by GitHub
parent 25a4e9448c
commit f257f4aad4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
netbox/netbox/views/generic/bulk_views.py
View File

@ -162,9 +162,8 @@ class ObjectListView(BaseMultiObjectView, ActionsMixin, TableMixin):
table = self.get_table(self.queryset, request, has_bulk_actions) 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 # Check for filterset_form on this view, if a form exists, apply to context and table, otherwise set to None
filterset_form = None if self.filterset_form:
if hasattr(self, 'filterset_form') and self.filterset_form: filterset_form = self.filterset_form(request.GET)
filterset_form = self.filterset_form(request.GET, label_suffix='')
table.filterset_form = filterset_form table.filterset_form = filterset_form
# If this is an HTMX request, return only the rendered table HTML # If this is an HTMX request, return only the rendered table HTML

3
netbox/templates/inc/table_header_filter_dropdown.html
View File

@ -1,7 +1,8 @@
{% load form_helpers %} {% load form_helpers %}
{% if form_field %} {% if form_field %}
<div class="column-filter dropdown"> <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> <i class="mdi mdi-filter-settings" style="font-size: 1.25rem;"> </i>
</a> </a>
<div class="dropdown-menu"> <div class="dropdown-menu">

8
netbox/templates/inc/table_htmx.html
View File

@ -17,8 +17,8 @@
><i class="mdi mdi-close"></i></a> ><i class="mdi mdi-close"></i></a>
</div> </div>
{% endif %} {% endif %}
{% if table.filterset_form %} {% if table.filterset_form %}
{% include 'inc/table_header_filter_dropdown.html' with form_field=table.filterset_form|getfilterfield:column.name %} {% include 'inc/table_header_filter_dropdown.html' with form_field=table.filterset_form|get_filter_field:column.name %}
{% endif %} {% endif %}
<a href="#" <a href="#"
hx-get="{{ table.htmx_url }}{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}" hx-get="{{ table.htmx_url }}{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}"
@ -28,8 +28,8 @@
</th> </th>
{% else %} {% else %}
<th {{ column.attrs.th.as_html }}> <th {{ column.attrs.th.as_html }}>
{% if table.filterset_form %} {% if table.filterset_form %}
{% include 'inc/table_header_filter_dropdown.html' with form_field=table.filterset_form|getfilterfield:column.name %} {% include 'inc/table_header_filter_dropdown.html' with form_field=table.filterset_form|get_filter_field:column.name %}
{% endif %} {% endif %}
{{ column.header }} {{ column.header }}
</th> </th>

4
netbox/utilities/templatetags/form_helpers.py
View File

@ -6,7 +6,7 @@ from utilities.forms.rendering import FieldSet, InlineFields, ObjectAttribute, T
__all__ = ( __all__ = (
'getfield', 'getfield',
'getfilterfield', 'get_filter_field',
'render_custom_fields', 'render_custom_fields',
'render_errors', 'render_errors',
'render_field', 'render_field',
@ -35,7 +35,7 @@ def getfield(form, fieldname):
@register.filter() @register.filter()
def getfilterfield(form, fieldname): def get_filter_field(form, fieldname):
field = getfield(form, f'{fieldname}') field = getfield(form, f'{fieldname}')
if field is not None: if field is not None:
return field return field