NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-23 04:22:01 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fix test error and OOB-swap

Browse Source
This commit is contained in:
Daniel Sheppard 2025-01-20 18:27:26 -06:00
parent 451a1f498d
commit 434cf37988
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
netbox/templates/generic/object_list.html
View File

@ -66,9 +66,10 @@ Context:
{# Object list tab #}
<div class="tab-pane show active" id="object-list" role="tabpanel" aria-labelledby="object-list-tab">
{# Applied filters #}
{% applied_filters model filter_form request.GET %}
{% if not request.htmx %}
{# Applied filters #}
{% applied_filters model filter_form request.GET %}
{% endif %}
{# Object table controls #}
{% include 'inc/table_controls_htmx.html' with table_modal="ObjectTable_config" %}

6
netbox/templates/htmx/table.html
View File

@ -3,8 +3,10 @@
{% load buttons %}
{% load render_table from django_tables2 %}
{# OOB Swaps to update various components #}
{% applied_filters model filter_form request.GET %}
{% if request.htmx %}
{# OOB Swaps to update various components #}
{% applied_filters model filter_form request.GET %}
{% endif %}
<div class="htmx-container table-responsive">
{% with preferences|get_key:"pagination.placement" as paginator_placement %}

3
netbox/utilities/templatetags/helpers.py
View File

@ -270,6 +270,8 @@ def applied_filters(context, model, form, query_params):
Display the active filters for a given filter form.
"""
user = context['request'].user
if not form:
return
form.is_valid() # Ensure cleaned_data has been set
applied_filters = []
@ -304,6 +306,7 @@ def applied_filters(context, model, form, query_params):
save_link = f"{url}?object_types={object_type}&parameters={quote(parameters)}"
return {
'request': context['request'],
'applied_filters': applied_filters,
'save_link': save_link,
}