Skip to content

Commit 236dc8b

Browse files
committed
Refine check to account scenario right after clearing ordering string
1 parent 0e92b13 commit 236dc8b

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

netbox/ipam/views.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,8 +609,11 @@ def get_children(self, request, parent):
609609
return parent.get_child_ips().restrict(request.user, 'view').prefetch_related('vrf', 'tenant', 'tenant__group')
610610

611611
def prep_table_data(self, request, queryset, parent):
612+
# Check for presence of a q string, an ordering string, or user preferences ordering and the ordering string
613+
# is blank
612614
if not request.GET.get('q') and not request.GET.get('sort') and not (
613-
request.user.is_authenticated and request.user.config.get(f'tables.IPAddressTable.ordering')
615+
request.user.is_authenticated and request.user.config.get(f'tables.IPAddressTable.ordering') and
616+
not request.GET.get('sort') == ''
614617
):
615618
return add_available_ipaddresses(parent.prefix, queryset, parent.is_pool)
616619
return queryset

0 commit comments

Comments
 (0)