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

Merge branch 'develop-2.10' of https://github.com/netbox-community/netbox into develop-2.10

Browse Source
This commit is contained in:
Jeremy Stretch 2020-11-24 09:44:54 -05:00
commit e1911a624b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-2.10.md
View File

@ -9,6 +9,7 @@
### Bug Fixes ### Bug Fixes
* [#5358](https://github.com/netbox-community/netbox/issues/5358) - Fix user table configuration for VM interfaces * [#5358](https://github.com/netbox-community/netbox/issues/5358) - Fix user table configuration for VM interfaces
* [#5374](https://github.com/netbox-community/netbox/issues/5374) - Fix exception thrown when tracing mid-point
--- ---

2
netbox/dcim/views.py
View File

@ -2076,7 +2076,7 @@ class PathTraceView(generic.ObjectView):
# Otherwise, find all CablePaths which traverse the specified object # Otherwise, find all CablePaths which traverse the specified object
else: else:
related_paths = CablePath.objects.filter(path__contains=obj).prefetch_related('origin') related_paths = CablePath.objects.filter(path__contains=instance).prefetch_related('origin')
# Check for specification of a particular path (when tracing pass-through ports) # Check for specification of a particular path (when tracing pass-through ports)
try: try:
path_id = int(request.GET.get('cablepath_id')) path_id = int(request.GET.get('cablepath_id'))