Backport ACL computation improvements

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2019-05-04 03:27:30 -04:00
parent d271f1503d
commit 8e731d6280
61 changed files with 701 additions and 609 deletions
+3 -2
View File
@@ -79,12 +79,13 @@ class APICheckedoutDocumentView(generics.RetrieveDestroyAPIView):
if document.checkout_info().user == request.user:
AccessControlList.objects.check_access(
obj=document, permissions=permission_document_check_in,
obj=document, permissions=(permission_document_check_in,),
user=request.user
)
else:
AccessControlList.objects.check_access(
obj=document, permissions=permission_document_check_in_override,
obj=document,
permissions=(permission_document_check_in_override,),
user=request.user
)
+1 -1
View File
@@ -42,7 +42,7 @@ class NewDocumentCheckoutSerializer(serializers.ModelSerializer):
document = Document.objects.get(pk=validated_data.pop('document_pk'))
AccessControlList.objects.check_access(
obj=document, permissions=permission_document_check_out,
obj=document, permissions=(permission_document_check_out,),
user=self.context['request'].user
)
+3 -3
View File
@@ -31,7 +31,7 @@ class CheckoutDocumentView(SingleObjectCreateView):
self.document = get_object_or_404(klass=Document, pk=self.kwargs['pk'])
AccessControlList.objects.check_access(
obj=self.document, permissions=permission_document_check_out,
obj=self.document, permissions=(permission_document_check_out,),
user=request.user
)
@@ -168,13 +168,13 @@ class DocumentCheckinView(ConfirmView):
if document.get_check_out_info().user == self.request.user:
AccessControlList.objects.check_access(
obj=document, permissions=permission_document_check_in,
obj=document, permissions=(permission_document_check_in,),
user=self.request.user
)
else:
AccessControlList.objects.check_access(
obj=document,
permissions=permission_document_check_in_override,
permissions=(permission_document_check_in_override,),
user=self.request.user
)