NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-24 17:38:37 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Regression fix: order_naturally() must come first in the queryset definition

Browse Source
This commit is contained in:
Jeremy Stretch 2017-01-18 11:55:48 -05:00
parent 769537fe98
commit fc7f88d2a2
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
netbox/dcim/views.py
View File

@ -601,16 +601,18 @@ def device(request, pk):
power_outlets = natsorted( power_outlets = natsorted(
PowerOutlet.objects.filter(device=device).select_related('connected_port'), key=attrgetter('name') PowerOutlet.objects.filter(device=device).select_related('connected_port'), key=attrgetter('name')
) )
interfaces = Interface.objects.filter(device=device, mgmt_only=False).select_related( interfaces = Interface.objects.order_naturally(device.device_type.interface_ordering)\
'connected_as_a__interface_b__device', .filter(device=device, mgmt_only=False).select_related(
'connected_as_b__interface_a__device', 'connected_as_a__interface_b__device',
'circuit_termination__circuit', 'connected_as_b__interface_a__device',
).order_naturally(device.device_type.interface_ordering) 'circuit_termination__circuit',
mgmt_interfaces = Interface.objects.filter(device=device, mgmt_only=True).select_related( )
'connected_as_a__interface_b__device', mgmt_interfaces = Interface.objects.order_naturally(device.device_type.interface_ordering)\
'connected_as_b__interface_a__device', .filter(device=device, mgmt_only=True).select_related(
'circuit_termination__circuit', 'connected_as_a__interface_b__device',
).order_naturally(device.device_type.interface_ordering) 'connected_as_b__interface_a__device',
'circuit_termination__circuit',
)
device_bays = natsorted( device_bays = natsorted(
DeviceBay.objects.filter(device=device).select_related('installed_device__device_type__manufacturer'), DeviceBay.objects.filter(device=device).select_related('installed_device__device_type__manufacturer'),
key=attrgetter('name') key=attrgetter('name')