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

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

View File

@@ -8,7 +8,7 @@ from rest_framework import generics
from acls.models import AccessEntry
from documents.models import Document
from documents.permissions import permission_document_view
from permissions.models import Permission
from permissions import Permission
from rest_api.filters import MayanObjectPermissionsFilter
from rest_api.permissions import MayanPermission
@@ -82,7 +82,7 @@ class APIIndexNodeInstanceDocumentListView(generics.ListAPIView):
def get_queryset(self):
index_node_instance = get_object_or_404(IndexInstanceNode, pk=self.kwargs['pk'])
try:
Permission.objects.check_permissions(self.request.user, [permission_document_indexing_view])
Permission.check_permissions(self.request.user, [permission_document_indexing_view])
except PermissionDenied:
AccessEntry.objects.check_access(permission_document_indexing_view, self.request.user, index_node_instance.index)
@@ -142,7 +142,7 @@ class APIDocumentIndexListView(generics.ListAPIView):
def get_queryset(self):
document = get_object_or_404(Document, pk=self.kwargs['pk'])
try:
Permission.objects.check_permissions(self.request.user, [permission_document_view])
Permission.check_permissions(self.request.user, [permission_document_view])
except PermissionDenied:
AccessEntry.objects.check_access(permission_document_view, self.request.user, document)