Merge branch 'issue-192-expose-fields-for-options' of github.com:nschlemm/django-rest-framework into issue-192-expose-fields-for-options

1 files changed, 7 insertions, 0 deletions

diff --git a/rest_framework/views.py b/rest_framework/views.py
index e8bd9f50..c9d55c18 100644
--- a/rest_framework/views.py
+++ b/rest_framework/views.py
@@ -79,7 +79,14 @@ class APIView(View):
             try:
                 self.check_permissions(cloned_request)
 
+                # TODO: discuss whether and how to expose parameters like e.g. filter or paginate
+                if method in ('GET', 'DELETE'):
+                    actions[method] = {}
+                    continue
+
                 # TODO: find right placement - APIView does not have get_serializer
+                if not hasattr(self, 'get_serializer'):
+                    continue
                 serializer = self.get_serializer()
                 if serializer is not None:
                     field_name_types = {}