mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Merge branch 'develop' into develop-2.9

Browse Source
This commit is contained in:
Jeremy Stretch
2020-07-02 10:01:01 -04:00
parent fa0c7a76cb 95462ce0ec
commit 8d7377ba04
23 changed files with 455 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
netbox/dcim/views.py
View File

@ -1915,7 +1915,7 @@ class CableTraceView(ObjectView):
def get(self, request, pk):
obj = get_object_or_404(self.queryset, pk=pk)
path, split_ends = obj.trace()
path, split_ends, position_stack = obj.trace()
total_length = sum(
[entry[1]._abs_length for entry in path if entry[1] and entry[1]._abs_length]
)
@ -1924,6 +1924,7 @@ class CableTraceView(ObjectView):
'obj': obj,
'trace': path,
'split_ends': split_ends,
'position_stack': position_stack,
'total_length': total_length,
})