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

Finish updating checkouts app to support organizations.

Browse Source
This commit is contained in:
Roberto Rosario
2016-06-08 16:58:57 -04:00
parent 7ae0917564
commit a2f8e8b8d8
10 changed files with 159 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mayan/apps/checkouts/api_views.py
View File

@@ -31,7 +31,7 @@ class APICheckedoutDocumentListView(generics.ListCreateAPIView):
return DocumentCheckoutSerializer
def get_queryset(self):
documents = DocumentCheckout.objects.checked_out_documents()
documents = DocumentCheckout.on_organization.checked_out_documents()
try:
Permission.check_permissions(
@@ -44,7 +44,7 @@ class APICheckedoutDocumentListView(generics.ListCreateAPIView):
else:
filtered_documents = documents
return DocumentCheckout.objects.filter(
return DocumentCheckout.on_organization.filter(
document__pk__in=filtered_documents.values_list('pk', flat=True)
)
@@ -80,7 +80,7 @@ class APICheckedoutDocumentListView(generics.ListCreateAPIView):
timezone = pytz.utc
try:
DocumentCheckout.objects.create(
DocumentCheckout.on_organization.create(
document=document,
expiration_datetime=timezone.localize(
serializer.data['expiration_datetime']
@@ -104,7 +104,7 @@ class APICheckedoutDocumentView(generics.RetrieveDestroyAPIView):
def get_queryset(self):
if self.request.method == 'GET':
documents = DocumentCheckout.objects.checked_out_documents()
documents = DocumentCheckout.on_organization.checked_out_documents()
try:
Permission.check_permissions(
@@ -117,13 +117,13 @@ class APICheckedoutDocumentView(generics.RetrieveDestroyAPIView):
else:
filtered_documents = documents
return DocumentCheckout.objects.filter(
return DocumentCheckout.on_organization.filter(
document__pk__in=filtered_documents.values_list(
'pk', flat=True
)
)
elif self.request.method == 'DELETE':
return DocumentCheckout.objects.all()
return DocumentCheckout.on_organization.all()
def get(self, request, *args, **kwargs):
"""