starred/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-04-24 17:58:43 +02:00
Code Issues 273 Packages Projects Releases 10 Wiki Activity

Merge branch 'develop' into virtualization

Browse Source
This commit is contained in:
Jeremy Stretch
2017-08-16 15:08:37 -04:00
parent b67e3ff957 70a6b171d0
commit 3009863877
19 changed files with 187 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/dcim/views.py
View File

@@ -862,7 +862,7 @@ class DeviceLLDPNeighborsView(PermissionRequiredMixin, View):
device = get_object_or_404(Device, pk=pk)
interfaces = Interface.objects.order_naturally(
device.device_type.interface_ordering
).filter(
).connectable().filter(
device=device
).select_related(
'connected_as_a', 'connected_as_b'