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

Modified is always going to be set

Browse Source
This commit is contained in:
shamoon
2026-02-22 16:13:12 -08:00
parent 53e2d9b850
commit 47d15273f9
4 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src-ui/src/app/components/document-detail/document-detail.component.ts
View File

@@ -146,7 +146,7 @@ enum ContentRenderType {
interface IncomingDocumentUpdate { interface IncomingDocumentUpdate {
document_id: number document_id: number
modified?: string modified: string
} }
@Component({ @Component({
@@ -449,7 +449,7 @@ export class DocumentDetailComponent
) )
} }
private showIncomingUpdateModal(modified?: string): void { private showIncomingUpdateModal(modified: string): void {
if (this.incomingUpdateModal) return if (this.incomingUpdateModal) return
const modal = this.modalService.open(ConfirmDialogComponent, { const modal = this.modalService.open(ConfirmDialogComponent, {
@@ -458,17 +458,11 @@ export class DocumentDetailComponent
this.incomingUpdateModal = modal this.incomingUpdateModal = modal
let formattedModified = null let formattedModified = null
if (modified) { const parsed = new Date(modified)
const parsed = new Date(modified) formattedModified = parsed.toLocaleString()
if (!Number.isNaN(parsed.getTime())) {
formattedModified = parsed.toLocaleString()
}
}
modal.componentInstance.title = $localize`Document was updated.` modal.componentInstance.title = $localize`Document was updated`
modal.componentInstance.messageBold = formattedModified modal.componentInstance.messageBold = $localize`Document was updated at ${formattedModified}.`
? $localize`Document was updated at ${formattedModified}.`
: $localize`This document was updated elsewhere.`
modal.componentInstance.message = $localize`Reload to discard your local unsaved edits and load the latest remote version.` modal.componentInstance.message = $localize`Reload to discard your local unsaved edits and load the latest remote version.`
modal.componentInstance.btnClass = 'btn-warning' modal.componentInstance.btnClass = 'btn-warning'
modal.componentInstance.btnCaption = $localize`Reload` modal.componentInstance.btnCaption = $localize`Reload`

2
src-ui/src/app/data/websocket-document-updated-message.ts
View File

@@ -1,6 +1,6 @@
export interface WebsocketDocumentUpdatedMessage { export interface WebsocketDocumentUpdatedMessage {
document_id: number document_id: number
modified?: string modified: string
owner_id?: number owner_id?: number
users_can_view?: number[] users_can_view?: number[]
groups_can_view?: number[] groups_can_view?: number[]

2
src/documents/plugins/helpers.py
View File

@@ -108,7 +108,7 @@ class DocumentsStatusManager(BaseStatusManager):
self, self,
*, *,
document_id: int, document_id: int,
modified: str | None = None, modified: str,
owner_id: int | None = None, owner_id: int | None = None,
users_can_view: list[int] | None = None, users_can_view: list[int] | None = None,
groups_can_view: list[int] | None = None, groups_can_view: list[int] | None = None,

4
src/documents/signals/handlers.py
View File

@@ -772,9 +772,7 @@ def send_websocket_document_updated(
with DocumentsStatusManager() as status_mgr: with DocumentsStatusManager() as status_mgr:
status_mgr.send_document_updated( status_mgr.send_document_updated(
document_id=document.id, document_id=document.id,
modified=DRF_DATETIME_FIELD.to_representation(document.modified) modified=DRF_DATETIME_FIELD.to_representation(document.modified),
if document.modified
else None,
owner_id=doc_overrides.owner_id, owner_id=doc_overrides.owner_id,
users_can_view=doc_overrides.view_users, users_can_view=doc_overrides.view_users,
groups_can_view=doc_overrides.view_groups, groups_can_view=doc_overrides.view_groups,