diff --git a/mayan/apps/checkouts/views.py b/mayan/apps/checkouts/views.py index 87bc42671d..7ef45bbcf7 100644 --- a/mayan/apps/checkouts/views.py +++ b/mayan/apps/checkouts/views.py @@ -27,7 +27,8 @@ from .permissions import ( class CheckoutListView(DocumentListView): - queryset = DocumentCheckout.objects.checked_out_documents() + def get_document_queryset(self): + return DocumentCheckout.objects.checked_out_documents() extra_context = { 'title': _('Documents checked out'), diff --git a/mayan/apps/documents/views.py b/mayan/apps/documents/views.py index f54951de47..3bb0fcb055 100644 --- a/mayan/apps/documents/views.py +++ b/mayan/apps/documents/views.py @@ -67,7 +67,13 @@ class DocumentListView(SingleObjectListView): 'title': _('All documents'), } object_permission = permission_document_view - queryset = Document.objects.all() + + def get_document_queryset(self): + return Document.objects.all() + + def get_queryset(self): + self.queryset = self.get_document_queryset() + return super(DocumentListView, self).get_queryset() class DocumentPageListView(ParentChildListView): @@ -96,7 +102,7 @@ class RecentDocumentListView(DocumentListView): 'title': _('Recent documents'), } - def get_queryset(self): + def get_document_queryset(self): return RecentDocument.objects.get_for_user(self.request.user) diff --git a/mayan/apps/folders/views.py b/mayan/apps/folders/views.py index c1ead412bf..5dfe1272a1 100644 --- a/mayan/apps/folders/views.py +++ b/mayan/apps/folders/views.py @@ -134,7 +134,7 @@ class FolderDetailView(DocumentListView): return folder - def get_queryset(self): + def get_document_queryset(self): return self.get_folder().documents.all() def get_extra_context(self): diff --git a/mayan/apps/metadata/views.py b/mayan/apps/metadata/views.py index 072c7851d4..c8aaf6428f 100644 --- a/mayan/apps/metadata/views.py +++ b/mayan/apps/metadata/views.py @@ -38,7 +38,9 @@ class MissingRequiredMetadataDocumentListView(DocumentListView): 'hide_links': True, 'title': _('Documents missing required metadata'), } - queryset = Document.objects.filter(document_type__metadata__required=True, metadata__value__isnull=True) + + def get_document_queryset(self): + return Document.objects.filter(document_type__metadata__required=True, metadata__value__isnull=True) def metadata_edit(request, document_id=None, document_id_list=None): diff --git a/mayan/apps/tags/views.py b/mayan/apps/tags/views.py index 8bb47cb0ae..774abc2906 100644 --- a/mayan/apps/tags/views.py +++ b/mayan/apps/tags/views.py @@ -215,7 +215,7 @@ class TagTaggedItemListView(DocumentListView): def get_tag(self): return get_object_or_404(Tag, pk=self.kwargs['pk']) - def get_queryset(self): + def get_document_queryset(self): return self.get_tag().documents.all() def get_extra_context(self):