From 4afce0f0d4316458b94fa873f327fb151a30bc48 Mon Sep 17 00:00:00 2001 From: Joseph Kennedy Date: Wed, 30 Aug 2017 20:59:12 -0400 Subject: [PATCH] Missing ordering --- netbox/dcim/filters.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index 471eab9cd..a01a8e4b6 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -623,14 +623,16 @@ class InterfaceListFilter(django_filters.FilterSet): def filter_site(self, queryset, name, value): try: site = Device.objects.select_related('device_id','site').get(**{name: value}) - return queryset + ordering = device.site.interface_ordering + return queryset.filter(device=device_id).order_naturally(ordering) except Device.DoesNotExist: return queryset.none() def filter_role(self, queryset, name, value): try: site = Device.objects.select_related('device_id','device_role').get(**{name: value}) - return queryset + ordering = device.device_role.interface_ordering + return queryset.filter(device=device_id).order_naturally(ordering) except Device.DoesNotExist: return queryset.none()