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

Fix evaluation of RestrictedQuerySet

Browse Source
This commit is contained in:
Jeremy Stretch 2020-06-29 14:41:43 -04:00
parent 5ed6136915
commit 71812d1bd5
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,7 +43,7 @@ class CableTraceMixin(object):
""" """
Trace a complete cable path and return each segment as a three-tuple of (termination, cable, termination). Trace a complete cable path and return each segment as a three-tuple of (termination, cable, termination).
""" """
obj = get_object_or_404(self.queryset.model, pk=pk) obj = get_object_or_404(self.queryset, pk=pk)
# Initialize the path array # Initialize the path array
path = [] path = []
@ -156,7 +156,7 @@ class RackViewSet(CustomFieldModelViewSet):
""" """
Rack elevation representing the list of rack units. Also supports rendering the elevation as an SVG. Rack elevation representing the list of rack units. Also supports rendering the elevation as an SVG.
""" """
rack = get_object_or_404(Rack, pk=pk) rack = get_object_or_404(self.queryset, pk=pk)
serializer = serializers.RackElevationDetailFilterSerializer(data=request.GET) serializer = serializers.RackElevationDetailFilterSerializer(data=request.GET)
if not serializer.is_valid(): if not serializer.is_valid():
return Response(serializer.errors, 400) return Response(serializer.errors, 400)
@ -369,7 +369,7 @@ class DeviceViewSet(CustomFieldModelViewSet):
""" """
Execute a NAPALM method on a Device Execute a NAPALM method on a Device
""" """
device = get_object_or_404(Device, pk=pk) device = get_object_or_404(self.queryset, pk=pk)
if not device.primary_ip: if not device.primary_ip:
raise ServiceUnavailable("This device does not have a primary IP address configured.") raise ServiceUnavailable("This device does not have a primary IP address configured.")
if device.platform is None: if device.platform is None:
@ -655,7 +655,11 @@ class ConnectedDeviceViewSet(ViewSet):
raise MissingFilterException(detail='Request must include "peer_device" and "peer_interface" filters.') raise MissingFilterException(detail='Request must include "peer_device" and "peer_interface" filters.')
# Determine local interface from peer interface's connection # Determine local interface from peer interface's connection
peer_interface = get_object_or_404(Interface, device__name=peer_device_name, name=peer_interface_name) peer_interface = get_object_or_404(
Interface.objects.unrestricted(),
device__name=peer_device_name,
name=peer_interface_name
)
local_interface = peer_interface._connected_interface local_interface = peer_interface._connected_interface
if local_interface is None: if local_interface is None:

2
netbox/dcim/models/__init__.py
View File

@ -673,7 +673,7 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
# Add devices to rack units list # Add devices to rack units list
if self.pk: if self.pk:
queryset = Device.objects.prefetch_related( queryset = Device.objects.unrestricted().prefetch_related(
'device_type', 'device_type',
'device_type__manufacturer', 'device_type__manufacturer',
'device_role' 'device_role'