Update apps for new ACLs refactor.
This commit is contained in:
@@ -8,7 +8,7 @@ from django.shortcuts import get_object_or_404
|
||||
from rest_framework import generics, status
|
||||
from rest_framework.response import Response
|
||||
|
||||
from acls.models import AccessEntry
|
||||
from acls.models import AccessControlList
|
||||
from documents.models import Document
|
||||
from documents.permissions import permission_document_view
|
||||
from permissions import Permission
|
||||
@@ -31,7 +31,7 @@ class APICheckedoutDocumentListView(generics.ListCreateAPIView):
|
||||
try:
|
||||
Permission.check_permissions(self.request.user, [permission_document_view])
|
||||
except PermissionDenied:
|
||||
filtered_documents = AccessEntry.objects.filter_objects_by_access([permission_document_view], self.request.user, documents)
|
||||
filtered_documents = AccessControlList.objects.filter_by_access([permission_document_view], self.request.user, documents)
|
||||
else:
|
||||
filtered_documents = documents
|
||||
|
||||
@@ -54,7 +54,7 @@ class APICheckedoutDocumentListView(generics.ListCreateAPIView):
|
||||
try:
|
||||
Permission.check_permissions(request.user, [permission_document_checkout])
|
||||
except PermissionDenied:
|
||||
AccessEntry.objects.check_access(permission_document_checkout, request.user, document)
|
||||
AccessControlList.objects.check_access(permission_document_checkout, request.user, document)
|
||||
|
||||
timezone = pytz.utc
|
||||
|
||||
@@ -83,7 +83,7 @@ class APICheckedoutDocumentView(generics.RetrieveDestroyAPIView):
|
||||
try:
|
||||
Permission.check_permissions(self.request.user, [permission_document_view])
|
||||
except PermissionDenied:
|
||||
filtered_documents = AccessEntry.objects.filter_objects_by_access([permission_document_view], self.request.user, documents)
|
||||
filtered_documents = AccessControlList.objects.filter_by_access([permission_document_view], self.request.user, documents)
|
||||
else:
|
||||
filtered_documents = documents
|
||||
|
||||
@@ -109,11 +109,11 @@ class APICheckedoutDocumentView(generics.RetrieveDestroyAPIView):
|
||||
try:
|
||||
Permission.check_permissions(request.user, [permission_document_checkin])
|
||||
except PermissionDenied:
|
||||
AccessEntry.objects.check_access(permission_document_checkin, request.user, document)
|
||||
AccessControlList.objects.check_access(permission_document_checkin, request.user, document)
|
||||
else:
|
||||
try:
|
||||
Permission.check_permissions(request.user, [permission_document_checkin_override])
|
||||
except PermissionDenied:
|
||||
AccessEntry.objects.check_access(permission_document_checkin_override, request.user, document)
|
||||
AccessControlList.objects.check_access(permission_document_checkin_override, request.user, document)
|
||||
|
||||
return super(APICheckedoutDocumentView, self).delete(request, *args, **kwargs)
|
||||
|
||||
Reference in New Issue
Block a user