From a67fc64afb2814450d0f55e88dbc33bfb3fdcd07 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 3 Apr 2017 11:04:17 -0400 Subject: [PATCH] Fixes #1025: Applied missing API view filters --- netbox/dcim/api/views.py | 7 ++++--- netbox/dcim/filters.py | 4 ++-- netbox/extras/api/views.py | 1 - netbox/ipam/api/views.py | 2 ++ netbox/secrets/api/views.py | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 77344f4fa..1b6da12ba 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -1,4 +1,4 @@ -from rest_framework.decorators import detail_route, list_route +from rest_framework.decorators import detail_route from rest_framework.permissions import IsAuthenticated from rest_framework.response import Response from rest_framework.viewsets import ModelViewSet, ViewSet @@ -38,8 +38,8 @@ class RegionViewSet(WritableSerializerMixin, ModelViewSet): class SiteViewSet(WritableSerializerMixin, CustomFieldModelViewSet): queryset = Site.objects.select_related('region', 'tenant') serializer_class = serializers.SiteSerializer - filter_class = filters.SiteFilter write_serializer_class = serializers.WritableSiteSerializer + filter_class = filters.SiteFilter @detail_route() def graphs(self, request, pk=None): @@ -59,8 +59,8 @@ class SiteViewSet(WritableSerializerMixin, CustomFieldModelViewSet): class RackGroupViewSet(WritableSerializerMixin, ModelViewSet): queryset = RackGroup.objects.select_related('site') serializer_class = serializers.RackGroupSerializer - filter_class = filters.RackGroupFilter write_serializer_class = serializers.WritableRackGroupSerializer + filter_class = filters.RackGroupFilter # @@ -135,6 +135,7 @@ class DeviceTypeViewSet(WritableSerializerMixin, CustomFieldModelViewSet): queryset = DeviceType.objects.select_related('manufacturer') serializer_class = serializers.DeviceTypeSerializer write_serializer_class = serializers.WritableDeviceTypeSerializer + filter_class = filters.DeviceTypeFilter # diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index 6eab5ae34..720cd0161 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -240,7 +240,7 @@ class InterfaceTemplateFilter(DeviceTypeComponentFilterSet): class Meta: model = InterfaceTemplate - fields = ['name'] + fields = ['name', 'form_factor'] class DeviceBayTemplateFilter(DeviceTypeComponentFilterSet): @@ -448,7 +448,7 @@ class InterfaceFilter(DeviceComponentFilterSet): class Meta: model = Interface - fields = ['name'] + fields = ['name', 'form_factor'] def filter_type(self, queryset, name, value): value = value.strip().lower() diff --git a/netbox/extras/api/views.py b/netbox/extras/api/views.py index fab1ccdb5..09d72fe0b 100644 --- a/netbox/extras/api/views.py +++ b/netbox/extras/api/views.py @@ -51,7 +51,6 @@ class GraphViewSet(WritableSerializerMixin, ModelViewSet): class ExportTemplateViewSet(WritableSerializerMixin, ModelViewSet): queryset = ExportTemplate.objects.all() serializer_class = serializers.ExportTemplateSerializer - # write_serializer_class = serializers.WritableExportTemplateSerializer filter_class = filters.ExportTemplateFilter diff --git a/netbox/ipam/api/views.py b/netbox/ipam/api/views.py index 3bd1f71c3..611931edf 100644 --- a/netbox/ipam/api/views.py +++ b/netbox/ipam/api/views.py @@ -34,6 +34,7 @@ class RoleViewSet(ModelViewSet): class RIRViewSet(ModelViewSet): queryset = RIR.objects.all() serializer_class = serializers.RIRSerializer + filter_class = filters.RIRFilter # @@ -99,3 +100,4 @@ class ServiceViewSet(WritableSerializerMixin, ModelViewSet): queryset = Service.objects.select_related('device') serializer_class = serializers.ServiceSerializer write_serializer_class = serializers.WritableServiceSerializer + filter_class = filters.ServiceFilter diff --git a/netbox/secrets/api/views.py b/netbox/secrets/api/views.py index 601f7aece..0e6314e17 100644 --- a/netbox/secrets/api/views.py +++ b/netbox/secrets/api/views.py @@ -8,8 +8,8 @@ from rest_framework.permissions import IsAuthenticated from rest_framework.response import Response from rest_framework.viewsets import ModelViewSet, ViewSet +from secrets import filters from secrets.exceptions import InvalidKey -from secrets.filters import SecretFilter from secrets.models import Secret, SecretRole, SessionKey, UserKey from utilities.api import WritableSerializerMixin from . import serializers @@ -43,7 +43,7 @@ class SecretViewSet(WritableSerializerMixin, ModelViewSet): ) serializer_class = serializers.SecretSerializer write_serializer_class = serializers.WritableSecretSerializer - filter_class = SecretFilter + filter_class = filters.SecretFilter master_key = None