From b619444e4380ad3bf4d1c86a8680b1eb0c989431 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Tue, 14 Aug 2018 03:32:33 -0400 Subject: [PATCH] Sort view classes. Signed-off-by: Roberto Rosario --- mayan/apps/documents/views/document_views.py | 86 ++++++++++---------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/mayan/apps/documents/views/document_views.py b/mayan/apps/documents/views/document_views.py index f2e7e6cbc9..daeca07ae6 100644 --- a/mayan/apps/documents/views/document_views.py +++ b/mayan/apps/documents/views/document_views.py @@ -68,25 +68,6 @@ class DocumentListView(SingleObjectListView): return self.get_document_queryset().filter(is_stub=False) -class DeletedDocumentListView(DocumentListView): - object_permission = None - - def get_document_queryset(self): - return AccessControlList.objects.filter_by_access( - permission_document_view, self.request.user, - queryset=DeletedDocument.trash.all() - ) - - def get_extra_context(self): - context = super(DeletedDocumentListView, self).get_extra_context() - context.update( - { - 'title': _('Documents in trash'), - } - ) - return context - - class DeletedDocumentDeleteView(ConfirmView): extra_context = { 'title': _('Delete the selected document?') @@ -125,6 +106,25 @@ class DeletedDocumentDeleteManyView(MultipleInstanceActionMixin, DeletedDocument success_message_plural = '%(count)d documents deleted.' +class DeletedDocumentListView(DocumentListView): + object_permission = None + + def get_document_queryset(self): + return AccessControlList.objects.filter_by_access( + permission_document_view, self.request.user, + queryset=DeletedDocument.trash.all() + ) + + def get_extra_context(self): + context = super(DeletedDocumentListView, self).get_extra_context() + context.update( + { + 'title': _('Documents in trash'), + } + ) + return context + + class DocumentDocumentTypeEditView(MultipleObjectFormActionView): form_class = DocumentTypeSelectForm model = Document @@ -241,6 +241,30 @@ class DocumentEditView(SingleObjectEditView): ) +class DocumentPreviewView(SingleObjectDetailView): + form_class = DocumentPreviewForm + model = Document + object_permission = permission_document_view + + def dispatch(self, request, *args, **kwargs): + result = super( + DocumentPreviewView, self + ).dispatch(request, *args, **kwargs) + self.get_object().add_as_recent_document_for_user(request.user) + event_document_view.commit( + actor=request.user, target=self.get_object() + ) + + return result + + def get_extra_context(self): + return { + 'hide_labels': True, + 'object': self.get_object(), + 'title': _('Preview of document: %s') % self.get_object(), + } + + class DocumentRestoreView(ConfirmView): extra_context = { 'title': _('Restore the selected document?') @@ -279,30 +303,6 @@ class DocumentRestoreManyView(MultipleInstanceActionMixin, DocumentRestoreView): success_message_plural = '%(count)d documents restored.' -class DocumentPreviewView(SingleObjectDetailView): - form_class = DocumentPreviewForm - model = Document - object_permission = permission_document_view - - def dispatch(self, request, *args, **kwargs): - result = super( - DocumentPreviewView, self - ).dispatch(request, *args, **kwargs) - self.get_object().add_as_recent_document_for_user(request.user) - event_document_view.commit( - actor=request.user, target=self.get_object() - ) - - return result - - def get_extra_context(self): - return { - 'hide_labels': True, - 'object': self.get_object(), - 'title': _('Preview of document: %s') % self.get_object(), - } - - class DocumentTrashView(ConfirmView): def get_extra_context(self): return {