NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-27 10:58:37 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix up duplication of template chits when rendering HTMX

Browse Source
This commit is contained in:
Daniel Sheppard 2024-04-22 22:42:42 -05:00
parent 1c995fa5f9
commit 479c69bd2d
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@ from django.db.models.fields.reverse_related import ManyToManyRel
from django.forms import HiddenInput, ModelMultipleChoiceField, MultipleHiddenInput from django.forms import HiddenInput, ModelMultipleChoiceField, MultipleHiddenInput
from django.http import HttpResponse from django.http import HttpResponse
from django.shortcuts import get_object_or_404, redirect, render from django.shortcuts import get_object_or_404, redirect, render
from django.template.loader import render_to_string
from django.urls import reverse from django.urls import reverse
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
from django.utils.translation import gettext as _ from django.utils.translation import gettext as _
@ -180,10 +181,14 @@ class ObjectListView(BaseMultiObjectView, ActionsMixin, TableMixin):
# Hide selection checkboxes # Hide selection checkboxes
if 'pk' in table.base_columns: if 'pk' in table.base_columns:
table.columns.hide('pk') table.columns.hide('pk')
return render(request, 'htmx/table.html', {
applied_filters = render_to_string('inc/applied_filters_pane.html', {
'model': model, 'model': model,
'table': table,
'filter_form': filterset_form, 'filter_form': filterset_form,
}, request)
return render(request, 'htmx/table.html', {
'table': table,
'applied_filters': applied_filters,
}) })
context = { context = {

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

@ -2,8 +2,8 @@
{% load helpers %} {% load helpers %}
{% load render_table from django_tables2 %} {% load render_table from django_tables2 %}
{# Applied filters #} {# Applied filters for OOB Swap #}
{% include 'inc/applied_filters_pane.html' %} {{ applied_filters }}
{% with preferences|get_key:"pagination.placement" as paginator_placement %} {% with preferences|get_key:"pagination.placement" as paginator_placement %}
{% if paginator_placement == 'top' or paginator_placement == 'both' %} {% if paginator_placement == 'top' or paginator_placement == 'both' %}