paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2026-02-14 00:09:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

More simplification I think

Browse Source
This commit is contained in:
shamoon
2026-02-12 19:05:21 -08:00
parent f5ee86e778
commit 965a16120d
1 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/documents/views.py
View File

@@ -964,18 +964,17 @@ class DocumentViewSet(
) )
def _resolve_file_doc(self, root_doc: Document, request): def _resolve_file_doc(self, root_doc: Document, request):
if get_request_version_param(request): version_requested = get_request_version_param(request) is not None
resolution = resolve_requested_version_for_root( resolution = resolve_requested_version_for_root(
root_doc, root_doc,
request, request,
include_deleted=True, include_deleted=version_requested,
) )
if resolution.error == VersionResolutionError.INVALID: if resolution.error == VersionResolutionError.INVALID:
raise NotFound("Invalid version parameter") raise NotFound("Invalid version parameter")
if resolution.document is None: if resolution.document is None:
raise Http404 raise Http404
return resolution.document return resolution.document
return get_latest_version_for_root(root_doc)
def _get_effective_file_doc( def _get_effective_file_doc(
self, self,
@@ -983,16 +982,12 @@ class DocumentViewSet(
root_doc: Document, root_doc: Document,
request: Request, request: Request,
) -> Document: ) -> Document:
# If a version is explicitly requested, use it. Otherwise: if (
# - if pk is a root document: serve newest version request_doc.root_document_id is not None
# - if pk is a version: serve that version and get_request_version_param(request) is None
if "version" in request.query_params: ):
return self._resolve_file_doc(root_doc, request) return request_doc
return ( return self._resolve_file_doc(root_doc, request)
self._resolve_file_doc(root_doc, request)
if request_doc.root_document_id is None
else request_doc
)
def file_response(self, pk, request, disposition): def file_response(self, pk, request, disposition):
request_doc = Document.global_objects.select_related( request_doc = Document.global_objects.select_related(