From 16c253b2da217ce7c32d367d4e6f0c343ae2b498 Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Mon, 26 Jun 2023 09:03:30 -0500 Subject: [PATCH] Refine check to account scenario right after clearing ordering string --- netbox/ipam/views.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index db162559f..656e05c57 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -606,8 +606,11 @@ class PrefixIPAddressesView(generic.ObjectChildrenView): return parent.get_child_ips().restrict(request.user, 'view').prefetch_related('vrf', 'tenant', 'tenant__group') def prep_table_data(self, request, queryset, parent): + # Check for presence of a q string, an ordering string, or user preferences ordering and the ordering string + # is blank if not request.GET.get('q') and not request.GET.get('sort') and not ( - request.user.is_authenticated and request.user.config.get(f'tables.IPAddressTable.ordering') + request.user.is_authenticated and request.user.config.get(f'tables.IPAddressTable.ordering') and + not request.GET.get('sort') == '' ): return add_available_ipaddresses(parent.prefix, queryset, parent.is_pool) return queryset