Cutlery/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-11-03 19:17:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev'

Browse Source
This commit is contained in:
Trenton H 2023-01-25 12:17:39 -08:00
commit 8164840cba
6 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@ -500,7 +500,7 @@ jobs:
- -
name: Create Release and Changelog name: Create Release and Changelog
id: create-release id: create-release
uses: paperless-ngx/release-drafter@master uses: release-drafter/release-drafter@v5
with: with:
name: Paperless-ngx ${{ steps.get_version.outputs.version }} name: Paperless-ngx ${{ steps.get_version.outputs.version }}
tag: ${{ steps.get_version.outputs.version }} tag: ${{ steps.get_version.outputs.version }}

2
Dockerfile
View File

@ -10,7 +10,7 @@ ARG PIKEPDF_VERSION
ARG PSYCOPG2_VERSION ARG PSYCOPG2_VERSION
FROM ghcr.io/paperless-ngx/paperless-ngx/builder/jbig2enc:${JBIG2ENC_VERSION} as jbig2enc-builder FROM ghcr.io/paperless-ngx/paperless-ngx/builder/jbig2enc:${JBIG2ENC_VERSION} as jbig2enc-builder
FROM ghcr.io/paperless-ngx/paperless-ngx/builder/qpdf:${QPDF_VERSION} as qpdf-builder FROM --platform=$BUILDPLATFORM ghcr.io/paperless-ngx/paperless-ngx/builder/qpdf:${QPDF_VERSION} as qpdf-builder
FROM ghcr.io/paperless-ngx/paperless-ngx/builder/pikepdf:${PIKEPDF_VERSION} as pikepdf-builder FROM ghcr.io/paperless-ngx/paperless-ngx/builder/pikepdf:${PIKEPDF_VERSION} as pikepdf-builder
FROM ghcr.io/paperless-ngx/paperless-ngx/builder/psycopg2:${PSYCOPG2_VERSION} as psycopg2-builder FROM ghcr.io/paperless-ngx/paperless-ngx/builder/psycopg2:${PSYCOPG2_VERSION} as psycopg2-builder

2
docker-builders/Dockerfile.pikepdf
View File

@ -8,7 +8,7 @@
ARG REPO="paperless-ngx/paperless-ngx" ARG REPO="paperless-ngx/paperless-ngx"
ARG QPDF_VERSION ARG QPDF_VERSION
FROM ghcr.io/${REPO}/builder/qpdf:${QPDF_VERSION} as qpdf-builder FROM --platform=$BUILDPLATFORM ghcr.io/${REPO}/builder/qpdf:${QPDF_VERSION} as qpdf-builder
# This does nothing, except provide a name for a copy below # This does nothing, except provide a name for a copy below

2
src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
View File

@ -26,7 +26,7 @@
</div> </div>
<p class="card-text"> <p class="card-text">
<span *ngIf="document.__search_hit__ && document.__search_hit__.highlights" [innerHtml]="document.__search_hit__.highlights"></span> <span *ngIf="document.__search_hit__ && document.__search_hit__.highlights" [innerHtml]="document.__search_hit__.highlights"></span>
<span *ngIf="document.__search_hit__ && document.__search_hit__.comment_highlights"> <span *ngIf="document.__search_hit__ && document.__search_hit__.comment_highlights" class="d-block">
<svg width="1em" height="1em" fill="currentColor" class="me-2"> <svg width="1em" height="1em" fill="currentColor" class="me-2">
<use xlink:href="assets/bootstrap-icons.svg#chat-left-text"/> <use xlink:href="assets/bootstrap-icons.svg#chat-left-text"/>
</svg> </svg>

2
src-ui/src/environments/environment.prod.ts
View File

@ -5,7 +5,7 @@ export const environment = {
apiBaseUrl: document.baseURI + 'api/', apiBaseUrl: document.baseURI + 'api/',
apiVersion: '2', apiVersion: '2',
appTitle: 'Paperless-ngx', appTitle: 'Paperless-ngx',
version: '1.12.0', version: '1.12.0-dev',
webSocketHost: window.location.host, webSocketHost: window.location.host,
webSocketProtocol: window.location.protocol == 'https:' ? 'wss:' : 'ws:', webSocketProtocol: window.location.protocol == 'https:' ? 'wss:' : 'ws:',
webSocketBaseUrl: base_url.pathname + 'ws/', webSocketBaseUrl: base_url.pathname + 'ws/',

27
src/documents/views.py
View File

@ -445,6 +445,10 @@ class DocumentViewSet(
) )
c.save() c.save()
from documents import index
index.add_or_update_document(self.get_object())
return Response(self.getComments(doc)) return Response(self.getComments(doc))
except Exception as e: except Exception as e:
logger.warning(f"An error occurred saving comment: {str(e)}") logger.warning(f"An error occurred saving comment: {str(e)}")
@ -456,6 +460,11 @@ class DocumentViewSet(
elif request.method == "DELETE": elif request.method == "DELETE":
comment = Comment.objects.get(id=int(request.GET.get("id"))) comment = Comment.objects.get(id=int(request.GET.get("id")))
comment.delete() comment.delete()
from documents import index
index.add_or_update_document(self.get_object())
return Response(self.getComments(doc)) return Response(self.getComments(doc))
return Response( return Response(
@ -468,14 +477,16 @@ class DocumentViewSet(
class SearchResultSerializer(DocumentSerializer): class SearchResultSerializer(DocumentSerializer):
def to_representation(self, instance): def to_representation(self, instance):
doc = Document.objects.get(id=instance["id"]) doc = Document.objects.get(id=instance["id"])
commentTerm = instance.results.q.subqueries[0] comments = ""
comments = ",".join( if hasattr(instance.results.q, "subqueries"):
[ commentTerm = instance.results.q.subqueries[0]
str(c.comment) comments = ",".join(
for c in Comment.objects.filter(document=instance["id"]) [
if commentTerm.text in c.comment str(c.comment)
], for c in Comment.objects.filter(document=instance["id"])
) if commentTerm.text in c.comment
],
)
r = super().to_representation(doc) r = super().to_representation(doc)
r["__search_hit__"] = { r["__search_hit__"] = {
"score": instance.score, "score": instance.score,