Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-rest-framework
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
django-rest-framework
Commits
c2e536bf
Commit
c2e536bf
authored
Apr 22, 2015
by
Nicolas Delaby
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tell DjangoModelPermissions to rely on get_queryset first.
parent
0ca11454
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
1 deletions
+24
-1
rest_framework/permissions.py
+7
-1
tests/test_permissions.py
+17
-0
No files found.
rest_framework/permissions.py
View file @
c2e536bf
...
...
@@ -107,7 +107,13 @@ class DjangoModelPermissions(BasePermission):
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.
...
...
tests/test_permissions.py
View file @
c2e536bf
...
...
@@ -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 @@ class ModelPermissionsIntegrationTests(TestCase):
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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment