Skip to content

Allow permission classes to customize the failure message. #2539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lovelydinosaur merged 3 commits into from
Jun 24, 2015
Merged

Allow permission classes to customize the failure message. #2539

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ea615a
add message to custom permission
Feb 10, 2015
9a9a00b
simplify argument handling
Feb 11, 2015
3d25dad
change custom message for clarity
Feb 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
simplify argument handling
  • Loading branch information
donewell authored and donewell committed Feb 11, 2015
commit 9a9a00bff2f61d08573f764012e389e7f8e5c6ae
16 changes: 7 additions & 9 deletions rest_framework/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,7 @@ def permission_denied(self, request, message=None):
"""
if not request.successful_authenticator:
raise exceptions.NotAuthenticated()
if message is not None:
raise exceptions.PermissionDenied(message)
raise exceptions.PermissionDenied()
raise exceptions.PermissionDenied(detail=message)

def throttled(self, request, wait):
"""
Expand Down Expand Up @@ -282,9 +280,9 @@ def check_permissions(self, request):
"""
for permission in self.get_permissions():
if not permission.has_permission(request, self):
if hasattr(permission, 'message'):
self.permission_denied(request, permission.message)
self.permission_denied(request)
self.permission_denied(
request, message=getattr(permission, 'message', None)
)

def check_object_permissions(self, request, obj):
"""
Expand All @@ -293,9 +291,9 @@ def check_object_permissions(self, request, obj):
"""
for permission in self.get_permissions():
if not permission.has_object_permission(request, self, obj):
if hasattr(permission, 'message'):
self.permission_denied(request, permission.message)
self.permission_denied(request)
self.permission_denied(
request, message=getattr(permission, 'message', None)
)

def check_throttles(self, request):
"""
Expand Down