NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-12-20 04:12:25 -06:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fixes #2691: Cable trace should follow circuits

Browse Source
This commit is contained in:
Jeremy Stretch
2018-12-19 12:48:20 -05:00
parent f4a22e5af3
commit 2f1db2fdf3
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/dcim/api/views.py
View File

@@ -60,7 +60,7 @@ class CableTraceMixin(object):
# Initialize the path array
path = []
for near_end, cable, far_end in obj.trace():
for near_end, cable, far_end in obj.trace(follow_circuits=True):
# Serialize each object
serializer_a = get_serializer_for_model(near_end, prefix='Nested')

2
netbox/dcim/models.py
View File

@@ -140,7 +140,7 @@ class CableTermination(models.Model):
if peer_port is None:
return path
next_segment = peer_port.trace(position)
next_segment = peer_port.trace(position, follow_circuits)
if next_segment is None:
return path + [(peer_port, None, None)]