mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Rename swap variable back and remove join

Browse Source
This commit is contained in:
Daniel Sheppard
2024-04-25 13:04:37 -05:00
parent 5830ae9e9a
commit fd38255d31
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,14 +181,13 @@ 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')
oob_swaps = [] filter_chits = render_to_string('inc/applied_filters_pane.html', {
oob_swaps.append(render_to_string('inc/applied_filters_pane.html', {
'model': model, 'model': model,
'filter_form': filterset_form, 'filter_form': filterset_form,
}, request)) }, request)
return render(request, 'htmx/table.html', { return render(request, 'htmx/table.html', {
'table': table, 'table': table,
'oob_swaps': "".join(oob_swaps), 'filter_chits': filter_chits,
}) })
context = { context = {

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

@ -3,7 +3,7 @@
{% load render_table from django_tables2 %} {% load render_table from django_tables2 %}
{# OOB Swaps to update various components #} {# OOB Swaps to update various components #}
{{ oob_swaps }} {{ filter_chits }}
{% 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' %}