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

Rename view and models from "deleted document" to "trashed document". Implement document level organization support via custom 'on_organization' manager. Unfilter default 'objects' manager to operate on all documents in the database.

Browse Source
This commit is contained in:
Roberto Rosario
2016-05-30 03:58:30 -04:00
parent 67f88b79c6
commit e5c9e91104
13 changed files with 341 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mayan/apps/documents/api_views.py
View File

@@ -27,7 +27,7 @@ from .permissions import (
permission_document_type_edit, permission_document_type_view
)
from .serializers import (
DeletedDocumentSerializer, DocumentPageImageSerializer,
TrashedDocumentSerializer, DocumentPageImageSerializer,
DocumentPageSerializer, DocumentSerializer,
DocumentTypeSerializer, DocumentVersionSerializer,
DocumentVersionRevertSerializer, NewDocumentSerializer,
@@ -37,7 +37,7 @@ from .serializers import (
logger = logging.getLogger(__name__)
class APIDeletedDocumentListView(generics.ListAPIView):
class APITrashedDocumentListView(generics.ListAPIView):
"""
Returns a list of all the trashed documents.
"""
@@ -46,10 +46,10 @@ class APIDeletedDocumentListView(generics.ListAPIView):
mayan_object_permissions = {'GET': (permission_document_view,)}
permission_classes = (MayanPermission,)
queryset = Document.trash.all()
serializer_class = DeletedDocumentSerializer
serializer_class = TrashedDocumentSerializer
class APIDeletedDocumentView(generics.RetrieveDestroyAPIView):
class APITrashedDocumentView(generics.RetrieveDestroyAPIView):
"""
Returns the selected trashed document details.
"""
@@ -59,17 +59,17 @@ class APIDeletedDocumentView(generics.RetrieveDestroyAPIView):
}
permission_classes = (MayanPermission,)
queryset = Document.trash.all()
serializer_class = DeletedDocumentSerializer
serializer_class = TrashedDocumentSerializer
def delete(self, *args, **kwargs):
"""
Delete the trashed document.
"""
return super(APIDeletedDocumentView, self).delete(*args, **kwargs)
return super(APITrashedDocumentView, self).delete(*args, **kwargs)
class APIDeletedDocumentRestoreView(generics.GenericAPIView):
class APITrashedDocumentRestoreView(generics.GenericAPIView):
"""
Restore a trashed document.
"""
@@ -80,7 +80,7 @@ class APIDeletedDocumentRestoreView(generics.GenericAPIView):
permission_classes = (MayanPermission,)
queryset = Document.trash.all()
serializer_class = DeletedDocumentSerializer
serializer_class = TrashedDocumentSerializer
def post(self, *args, **kwargs):
self.get_object().restore()