encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-27 03:54:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1312 from amatellanes/master

Browse Source 
Simplified some functions in permissions.py
This commit is contained in:
Tom Christie 2013-12-22 04:53:00 -08:00
commit 9b7341e484
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rest_framework/permissions.py
View File

@ -54,9 +54,7 @@ class IsAuthenticated(BasePermission):
""" """
def has_permission(self, request, view): def has_permission(self, request, view):
if request.user and request.user.is_authenticated(): return request.user and request.user.is_authenticated()
return True
return False
class IsAdminUser(BasePermission): class IsAdminUser(BasePermission):
@ -65,9 +63,7 @@ class IsAdminUser(BasePermission):
""" """
def has_permission(self, request, view): def has_permission(self, request, view):
if request.user and request.user.is_staff: return request.user and request.user.is_staff
return True
return False
class IsAuthenticatedOrReadOnly(BasePermission): class IsAuthenticatedOrReadOnly(BasePermission):
@ -76,11 +72,9 @@ class IsAuthenticatedOrReadOnly(BasePermission):
""" """
def has_permission(self, request, view): def has_permission(self, request, view):
if (request.method in SAFE_METHODS or return (request.method in SAFE_METHODS or
request.user and request.user and
request.user.is_authenticated()): request.user.is_authenticated())
return True
return False
class DjangoModelPermissions(BasePermission): class DjangoModelPermissions(BasePermission):
@ -138,11 +132,9 @@ class DjangoModelPermissions(BasePermission):
perms = self.get_required_permissions(request.method, model_cls) perms = self.get_required_permissions(request.method, model_cls)
if (request.user and return (request.user and
(request.user.is_authenticated() or not self.authenticated_users_only) and (request.user.is_authenticated() or not self.authenticated_users_only) and
request.user.has_perms(perms)): request.user.has_perms(perms))
return True
return False
class DjangoModelPermissionsOrAnonReadOnly(DjangoModelPermissions): class DjangoModelPermissionsOrAnonReadOnly(DjangoModelPermissions):