Merge pull request #2863 from ticosax/rely-on-get_queryset

Carlton Gibson · Carlton Gibson · commit fe7cd8475b96 · 2015-04-22T11:06:15.000+02:00
Tell DjangoModelPermissions to rely on get_queryset first.
diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py
@@ -107,7 +107,13 @@ def get_required_permissions(self, method, model_cls):
         return [perm % kwargs for perm in self.perms_map[method]]
 
     def has_permission(self, request, view):
-        queryset = getattr(view, 'queryset', None)
+        try:
+            queryset = view.get_queryset()
+        except AttributeError:
+            queryset = getattr(view, 'queryset', None)
+        except AssertionError:
+            # view.get_queryset() didn't find .queryset
+            queryset = None
 
         # Workaround to ensure DjangoModelPermissions are not applied
         # to the root view when using DefaultRouter.
diff --git a/tests/test_permissions.py b/tests/test_permissions.py
@@ -31,8 +31,19 @@ class InstanceView(generics.RetrieveUpdateDestroyAPIView):
     authentication_classes = [authentication.BasicAuthentication]
     permission_classes = [permissions.DjangoModelPermissions]
 
+
+class GetQuerySetListView(generics.ListCreateAPIView):
+    serializer_class = BasicSerializer
+    authentication_classes = [authentication.BasicAuthentication]
+    permission_classes = [permissions.DjangoModelPermissions]
+
+    def get_queryset(self):
+        return BasicModel.objects.all()
+
+
 root_view = RootView.as_view()
 instance_view = InstanceView.as_view()
+get_queryset_list_view = GetQuerySetListView.as_view()
 
 
 def basic_auth_header(username, password):
@@ -67,6 +78,12 @@ def test_has_create_permissions(self):
         response = root_view(request, pk=1)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
+    def test_get_queryset_has_create_permissions(self):
+        request = factory.post('/', {'text': 'foobar'}, format='json',
+                               HTTP_AUTHORIZATION=self.permitted_credentials)
+        response = get_queryset_list_view(request, pk=1)
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+
     def test_has_put_permissions(self):
         request = factory.put('/1', {'text': 'foobar'}, format='json',
                               HTTP_AUTHORIZATION=self.permitted_credentials)
