Briq
/
drf-yasg
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify should_filter and should_page

openapi3
Cristi Vîjdea 2018-01-01 15:27:26 +01:00
parent 74fcd47047
commit faf81e7b6d
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/drf_yasg/inspectors/base.py
View File

@ -4,7 +4,6 @@ import logging
from django.utils.encoding import force_text from django.utils.encoding import force_text
from rest_framework import serializers from rest_framework import serializers
from rest_framework.utils import encoders, json from rest_framework.utils import encoders, json
from rest_framework.viewsets import GenericViewSet
from .. import openapi from .. import openapi
from ..utils import is_list_view from ..utils import is_list_view
@ -322,9 +321,6 @@ class ViewInspector(BaseInspector):
if self.method.lower() not in ["get", "delete"]: if self.method.lower() not in ["get", "delete"]:
return False return False
if not isinstance(self.view, GenericViewSet):
return True
return is_list_view(self.path, self.method, self.view) return is_list_view(self.path, self.method, self.view)
def get_filter_parameters(self): def get_filter_parameters(self):
@ -346,10 +342,7 @@ class ViewInspector(BaseInspector):
:rtype: bool :rtype: bool
""" """
if not hasattr(self.view, 'paginator'): if not getattr(self.view, 'paginator', None):
return False
if self.view.paginator is None:
return False return False
if self.method.lower() != 'get': if self.method.lower() != 'get':

2
src/drf_yasg/utils.py
View File

@ -166,7 +166,7 @@ def is_list_view(path, method, view):
# a detail_route is surely not a list route # a detail_route is surely not a list route
return False return False
# for APIView, if it's a detail view it can't also be a list view # for GenericAPIView, if it's a detail view it can't also be a list view
if isinstance(view, (RetrieveModelMixin, UpdateModelMixin, DestroyModelMixin)): if isinstance(view, (RetrieveModelMixin, UpdateModelMixin, DestroyModelMixin)):
return False return False