NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-07 16:18:16 -06:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Missing ordering

Browse Source
This commit is contained in:
Joseph Kennedy 2017-08-30 20:59:12 -04:00
parent 2dd97896da
commit 4afce0f0d4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/dcim/filters.py
View File

@ -623,14 +623,16 @@ class InterfaceListFilter(django_filters.FilterSet):
def filter_site(self, queryset, name, value): def filter_site(self, queryset, name, value):
try: try:
site = Device.objects.select_related('device_id','site').get(**{name: value}) 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: except Device.DoesNotExist:
return queryset.none() return queryset.none()
def filter_role(self, queryset, name, value): def filter_role(self, queryset, name, value):
try: try:
site = Device.objects.select_related('device_id','device_role').get(**{name: value}) 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: except Device.DoesNotExist:
return queryset.none() return queryset.none()