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

Fix folder document list. GitLab issue #273

Browse Source
This commit is contained in:
Roberto Rosario
2016-05-24 18:18:40 -04:00
parent c37430ff12
commit 433e295d07
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mayan/apps/folders/views.py
View File

@@ -90,7 +90,7 @@ class FolderDetailView(DocumentListView):
} }
def get_folder(self): def get_folder(self):
folder = get_object_or_404(Folder.on_organization, pk=self.kwargs['pk']) return get_object_or_404(Folder.on_organization, pk=self.kwargs['pk'])
class FolderEditView(SingleObjectEditView): class FolderEditView(SingleObjectEditView):
@@ -129,7 +129,7 @@ class FolderListView(SingleObjectListView):
class DocumentFolderListView(FolderListView): class DocumentFolderListView(FolderListView):
def dispatch(self, request, *args, **kwargs): def dispatch(self, request, *args, **kwargs):
self.document = get_object_or_404( self.document = get_object_or_404(
Document.on_organization, pk=self.kwargs['pk'] Document.objects.filter(document_type__organization__id=settings.ORGANIZATION_ID), pk=self.kwargs['pk']
) )
try: try:
@@ -155,7 +155,7 @@ class DocumentFolderListView(FolderListView):
def folder_add_document(request, document_id=None, document_id_list=None): def folder_add_document(request, document_id=None, document_id_list=None):
queryset = Document.on_organization.all() queryset = Document.objects.filter(document_type__organization__id=settings.ORGANIZATION_ID)
if document_id: if document_id:
queryset = queryset.filter(pk=document_id) queryset = queryset.filter(pk=document_id)