encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-01 19:10:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix the way DjangoModelPermissions asks for the model to be checked.

Browse Source
This commit is contained in:
Emil Santurio 2018-11-07 13:46:38 -03:00
parent bf9533ae37
commit fbef9ca9e4
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rest_framework/permissions.py
View File

@ -184,13 +184,15 @@ class DjangoModelPermissions(BasePermission):
'`.queryset` or have a `.get_queryset()` method.' '`.queryset` or have a `.get_queryset()` method.'
).format(self.__class__.__name__) ).format(self.__class__.__name__)
if hasattr(view, 'get_queryset'): queryset = getattr(view, 'queryset', None)
if queryset is None:
queryset = view.get_queryset() queryset = view.get_queryset()
assert queryset is not None, ( assert queryset is not None, (
'{}.get_queryset() returned None'.format(view.__class__.__name__) 'The value of {0}.queryset and {0}.get_queryset() is None.'.format(view.__class__.__name__)
) )
return queryset
return view.queryset return queryset
def has_permission(self, request, view): def has_permission(self, request, view):
# Workaround to ensure DjangoModelPermissions are not applied # Workaround to ensure DjangoModelPermissions are not applied

5
tests/test_permissions.py
View File

@ -236,12 +236,14 @@ class ModelPermissionsIntegrationTests(TestCase):
# Faulty `get_queryset()` methods should trigger the above "view does not have a queryset" assertion. # Faulty `get_queryset()` methods should trigger the above "view does not have a queryset" assertion.
class View(RootView): class View(RootView):
queryset = None
def get_queryset(self): def get_queryset(self):
return None return None
view = View.as_view() view = View.as_view()
request = factory.get('/', HTTP_AUTHORIZATION=self.permitted_credentials) request = factory.get('/', HTTP_AUTHORIZATION=self.permitted_credentials)
with self.assertRaisesMessage(AssertionError, 'View.get_queryset() returned None'): with self.assertRaisesMessage(AssertionError, 'The value of View.queryset and View.get_queryset() is None.'):
view(request) view(request)
@ -589,3 +591,4 @@ class PermissionsCompositionTests(TestCase):
permissions.IsAuthenticated permissions.IsAuthenticated
) )
assert composed_perm().has_permission(request, None) is True assert composed_perm().has_permission(request, None) is True