matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Split Permission and StoredPermission class and model into different modules. Simplified the Permission class.

Browse Source
This commit is contained in:
Roberto Rosario
2015-06-28 01:02:49 -04:00
parent d26402974a
commit 1c084aa07b
58 changed files with 354 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mayan/apps/rest_api/filters.py
View File

@@ -5,7 +5,7 @@ from django.core.exceptions import PermissionDenied
from rest_framework.filters import BaseFilterBackend
from acls.models import AccessEntry
from permissions.models import Permission
from permissions import Permission
class MayanObjectPermissionsFilter(BaseFilterBackend):
@@ -14,7 +14,7 @@ class MayanObjectPermissionsFilter(BaseFilterBackend):
if required_permission:
try:
Permission.objects.check_permissions(request.user, required_permission)
Permission.check_permissions(request.user, required_permission)
except PermissionDenied:
return AccessEntry.objects.filter_objects_by_access(required_permission[0], request.user, queryset)
else:

6
mayan/apps/rest_api/permissions.py
View File

@@ -7,7 +7,7 @@ from django.core.exceptions import PermissionDenied
from rest_framework.permissions import BasePermission
from acls.models import AccessEntry
from permissions.models import Permission
from permissions import Permission
class MayanPermission(BasePermission):
@@ -16,7 +16,7 @@ class MayanPermission(BasePermission):
if required_permission:
try:
Permission.objects.check_permissions(request.user, required_permission)
Permission.check_permissions(request.user, required_permission)
except PermissionDenied:
return False
else:
@@ -29,7 +29,7 @@ class MayanPermission(BasePermission):
if required_permission:
try:
Permission.objects.check_permissions(request.user, required_permission)
Permission.check_permissions(request.user, required_permission)
except PermissionDenied:
try:
if hasattr(view, 'mayan_permission_attribute_check'):