lgcosta/paperless-ngx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #39 from tienthienhd/fixbug/delete-warehouse

Browse Source 
fix:get-folders-documents
This commit is contained in:
hungdztrau123 2024-06-13 08:22:51 +07:00 committed by GitHub
commit 2c95673e75
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/documents/views.py
View File

@ -1923,16 +1923,16 @@ class WarehouseViewSet(ModelViewSet, PermissionsAwareDocumentCountMixin):
ordering_fields = ("name", "type", "parent_warehouse", "document_count") ordering_fields = ("name", "type", "parent_warehouse", "document_count")
def getWarehouseDoc(self, wareh): def getWarehouseDoc(self, wareh):
currentUser = self.request.user
if wareh.type == Warehouse.BOXCASE: if wareh.type == Warehouse.BOXCASE:
return list(Document.objects.filter(warehouse=wareh).order_by("-created").values()) return list(Document.objects.filter(warehouse=wareh, owner=currentUser).order_by("-created").values())
elif wareh.type == Warehouse.SHELF: elif wareh.type == Warehouse.SHELF:
boxcases = Warehouse.objects.filter(parent_warehouse=wareh) boxcases = Warehouse.objects.filter(parent_warehouse=wareh)
return list(Document.objects.filter(warehouse__in=[b.id for b in boxcases]).order_by("-created").values()) return list(Document.objects.filter(warehouse__in=[b.id for b in boxcases], owner=currentUser).order_by("-created").values())
elif wareh.type == Warehouse.WAREHOUSE: elif wareh.type == Warehouse.WAREHOUSE:
shelves = Warehouse.objects.filter(parent_warehouse=wareh) shelves = Warehouse.objects.filter(parent_warehouse=wareh)
boxcases = Warehouse.objects.filter(parent_warehouse__in=[s.id for s in shelves]) boxcases = Warehouse.objects.filter(parent_warehouse__in=[s.id for s in shelves])
return list(Document.objects.filter(warehouse__in=[b.id for b in boxcases]).order_by("-created").values()) return list(Document.objects.filter(warehouse__in=[b.id for b in boxcases], owner=currentUser).order_by("-created").values())
else: else:
return list(Document.objects.none()) return list(Document.objects.none())
@ -2124,7 +2124,7 @@ class FolderViewSet(ModelViewSet, PermissionsAwareDocumentCountMixin):
child_folders = list(Folder.objects.filter(parent_folder=fol).order_by("name").values()) child_folders = list(Folder.objects.filter(parent_folder=fol).order_by("name").values())
return { return {
"documents": documents, "documents": documents,
"child_folders": child_folders, "folders": child_folders,
} }
@action(methods=["get"], detail=True) @action(methods=["get"], detail=True)