From d4ac6dbfe4613badcdc22ef67825a6b41a463a83 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 5 Apr 2017 13:38:23 -0400 Subject: [PATCH] Fixes #1043: Corrected queryset in WritableDeviceSerializer validation --- netbox/dcim/api/serializers.py | 2 +- netbox/dcim/api/views.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index e9a1bd61e..a3149f963 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -490,7 +490,7 @@ class WritableDeviceSerializer(serializers.ModelSerializer): # Validate uniqueness of (rack, position, face) since we omitted the automatically-created validator from Meta. if data.get('rack') and data.get('position') and data.get('face'): - validator = UniqueTogetherValidator(queryset=Rack.objects.all(), fields=('rack', 'position', 'face')) + validator = UniqueTogetherValidator(queryset=Device.objects.all(), fields=('rack', 'position', 'face')) validator.set_context(self) validator(data) diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 67ea8504e..58002d1cf 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -2,16 +2,16 @@ from rest_framework.decorators import detail_route from rest_framework.mixins import ListModelMixin from rest_framework.permissions import IsAuthenticated from rest_framework.response import Response -from rest_framework.viewsets import GenericViewSet, ModelViewSet, ReadOnlyModelViewSet, ViewSet +from rest_framework.viewsets import GenericViewSet, ModelViewSet, ViewSet from django.conf import settings from django.shortcuts import get_object_or_404 from dcim.models import ( ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, - DeviceBayTemplate, DeviceRole, DeviceType, Interface, InterfaceConnection, InterfaceTemplate, Manufacturer, InventoryItem, - Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, RackGroup, RackReservation, - RackRole, Region, Site, + DeviceBayTemplate, DeviceRole, DeviceType, Interface, InterfaceConnection, InterfaceTemplate, Manufacturer, + InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, RackGroup, + RackReservation, RackRole, Region, Site, ) from dcim import filters from extras.api.serializers import RenderedGraphSerializer