From 7265ac64ee8fe08255e633dad18032ed741b2024 Mon Sep 17 00:00:00 2001 From: David Moreau Simard Date: Tue, 16 Oct 2018 14:51:17 -0400 Subject: [PATCH] Add DjangoFilterBackend to default DRF filter backends This makes it so it's not required to add to every viewset. Change-Id: Ibd1a9bde4750424c34986ada97d15550e2ba5e85 --- ara/api/views.py | 7 ------- ara/server/settings.py | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/ara/api/views.py b/ara/api/views.py index b528d83..9a1cf8e 100644 --- a/ara/api/views.py +++ b/ara/api/views.py @@ -15,7 +15,6 @@ # You should have received a copy of the GNU General Public License # along with ARA. If not, see . from django.db import transaction -from django_filters.rest_framework import DjangoFilterBackend from rest_framework import viewsets from rest_framework_extensions.mixins import NestedViewSetMixin @@ -30,7 +29,6 @@ class LabelViewSet(viewsets.ModelViewSet): class PlaybookViewSet(viewsets.ModelViewSet): queryset = models.Playbook.objects.all() serializer_class = serializers.PlaybookSerializer - filter_backends = (DjangoFilterBackend,) filter_fields = ("name",) @@ -48,28 +46,24 @@ class PlaybookFilesDetail(NestedViewSetMixin, viewsets.ModelViewSet): class PlayViewSet(viewsets.ModelViewSet): queryset = models.Play.objects.all() serializer_class = serializers.PlaySerializer - filter_backends = (DjangoFilterBackend,) filter_fields = ("playbook", "uuid") class TaskViewSet(viewsets.ModelViewSet): queryset = models.Task.objects.all() serializer_class = serializers.TaskSerializer - filter_backends = (DjangoFilterBackend,) filter_fields = ("playbook",) class HostViewSet(viewsets.ModelViewSet): queryset = models.Host.objects.all() serializer_class = serializers.HostSerializer - filter_backends = (DjangoFilterBackend,) filter_fields = ("playbook",) class ResultViewSet(viewsets.ModelViewSet): queryset = models.Result.objects.all() serializer_class = serializers.ResultSerializer - filter_backends = (DjangoFilterBackend,) filter_fields = ("playbook", "status") @@ -86,5 +80,4 @@ class RecordViewSet(viewsets.ModelViewSet): class StatsViewSet(viewsets.ModelViewSet): queryset = models.Stats.objects.all() serializer_class = serializers.StatsSerializer - filter_backends = (DjangoFilterBackend,) filter_fields = ("playbook", "host") diff --git a/ara/server/settings.py b/ara/server/settings.py index c76ff95..36b4e53 100644 --- a/ara/server/settings.py +++ b/ara/server/settings.py @@ -146,6 +146,7 @@ REST_FRAMEWORK = { 'DEFAULT_FILTER_BACKENDS': ( 'rest_framework.filters.OrderingFilter', 'rest_framework.filters.SearchFilter', + 'django_filters.rest_framework.DjangoFilterBackend' ), 'DEFAULT_RENDERER_CLASSES': ( 'rest_framework.renderers.JSONRenderer',