diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 4655767fd..58d8d0d4c 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -545,7 +545,7 @@
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">364</context>
+ <context context-type="linenumber">360</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/common/edit-dialog/correspondent-edit-dialog/correspondent-edit-dialog.component.html</context>
@@ -1034,8 +1034,8 @@
<context context-type="linenumber">188</context>
</context-group>
</trans-unit>
- <trans-unit id="7791089127901960679" datatype="html">
- <source>Default zoom:</source>
+ <trans-unit id="2678648946508279627" datatype="html">
+ <source>Default zoom</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
<context context-type="linenumber">194</context>
@@ -1076,11 +1076,79 @@
<context context-type="linenumber">213</context>
</context-group>
</trans-unit>
+ <trans-unit id="6760166989231109310" datatype="html">
+ <source>Global search</source>
+ <context-group purpose="location">
+ <context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
+ <context context-type="linenumber">217</context>
+ </context-group>
+ <context-group purpose="location">
+ <context context-type="sourcefile">src/app/components/app-frame/global-search/global-search.component.ts</context>
+ <context context-type="linenumber">120</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="2818183879511244335" datatype="html">
+ <source>Do not include advanced search results</source>
+ <context-group purpose="location">
+ <context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
+ <context context-type="linenumber">220</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="3969258421469113318" datatype="html">
+ <source>Full search links to</source>
+ <context-group purpose="location">
+ <context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
+ <context context-type="linenumber">226</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="6631288852577115923" datatype="html">
+ <source>Title and content search</source>
+ <context-group purpose="location">
+ <context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
+ <context context-type="linenumber">230</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="1010505078885609376" datatype="html">
+ <source>Advanced search</source>
+ <context-group purpose="location">
+ <context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
+ <context context-type="linenumber">231</context>
+ </context-group>
+ <context-group purpose="location">
+ <context context-type="sourcefile">src/app/components/app-frame/global-search/global-search.component.html</context>
+ <context context-type="linenumber">24</context>
+ </context-group>
+ <context-group purpose="location">
+ <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
+ <context context-type="linenumber">173</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="8508424367627989968" datatype="html">
+ <source>Bulk editing</source>
+ <context-group purpose="location">
+ <context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
+ <context context-type="linenumber">236</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="8158899674926420054" datatype="html">
+ <source>Show confirmation dialogs</source>
+ <context-group purpose="location">
+ <context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
+ <context context-type="linenumber">239</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="290238406234356122" datatype="html">
+ <source>Apply on close</source>
+ <context-group purpose="location">
+ <context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
+ <context context-type="linenumber">240</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="8104421162933956065" datatype="html">
<source>Notes</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">217</context>
+ <context context-type="linenumber">244</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
@@ -1097,84 +1165,16 @@
</trans-unit>
<trans-unit id="293524471897878391" datatype="html">
<source>Enable notes</source>
- <context-group purpose="location">
- <context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">220</context>
- </context-group>
- </trans-unit>
- <trans-unit id="8508424367627989968" datatype="html">
- <source>Bulk editing</source>
- <context-group purpose="location">
- <context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">224</context>
- </context-group>
- </trans-unit>
- <trans-unit id="8158899674926420054" datatype="html">
- <source>Show confirmation dialogs</source>
- <context-group purpose="location">
- <context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">227</context>
- </context-group>
- </trans-unit>
- <trans-unit id="290238406234356122" datatype="html">
- <source>Apply on close</source>
- <context-group purpose="location">
- <context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">228</context>
- </context-group>
- </trans-unit>
- <trans-unit id="6760166989231109310" datatype="html">
- <source>Global search</source>
- <context-group purpose="location">
- <context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">232</context>
- </context-group>
- <context-group purpose="location">
- <context context-type="sourcefile">src/app/components/app-frame/global-search/global-search.component.ts</context>
- <context context-type="linenumber">120</context>
- </context-group>
- </trans-unit>
- <trans-unit id="2818183879511244335" datatype="html">
- <source>Do not include advanced search results</source>
- <context-group purpose="location">
- <context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">235</context>
- </context-group>
- </trans-unit>
- <trans-unit id="3969258421469113318" datatype="html">
- <source>Full search links to</source>
- <context-group purpose="location">
- <context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">243</context>
- </context-group>
- </trans-unit>
- <trans-unit id="6631288852577115923" datatype="html">
- <source>Title and content search</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
<context context-type="linenumber">247</context>
</context-group>
</trans-unit>
- <trans-unit id="1010505078885609376" datatype="html">
- <source>Advanced search</source>
- <context-group purpose="location">
- <context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">248</context>
- </context-group>
- <context-group purpose="location">
- <context context-type="sourcefile">src/app/components/app-frame/global-search/global-search.component.html</context>
- <context context-type="linenumber">24</context>
- </context-group>
- <context-group purpose="location">
- <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
- <context context-type="linenumber">173</context>
- </context-group>
- </trans-unit>
<trans-unit id="7314814725704332646" datatype="html">
<source>Permissions</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">262</context>
+ <context context-type="linenumber">258</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/common/edit-dialog/group-edit-dialog/group-edit-dialog.component.html</context>
@@ -1237,28 +1237,28 @@
<source>Default Permissions</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">265</context>
+ <context context-type="linenumber">261</context>
</context-group>
</trans-unit>
- <trans-unit id="8222269449891326545" datatype="html">
- <source> Settings apply to this user account for objects (Tags, Mail Rules, etc.) created via the web UI </source>
+ <trans-unit id="6544153565064275581" datatype="html">
+ <source> Settings apply to this user account for objects (Tags, Mail Rules, etc. but not documents) created via the web UI. </source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">269,271</context>
+ <context context-type="linenumber">265,267</context>
</context-group>
</trans-unit>
<trans-unit id="4292903881380648974" datatype="html">
<source>Default Owner</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">276</context>
+ <context context-type="linenumber">272</context>
</context-group>
</trans-unit>
<trans-unit id="734147282056744882" datatype="html">
<source>Objects without an owner can be viewed and edited by all users</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">280</context>
+ <context context-type="linenumber">276</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/common/input/permissions/permissions-form/permissions-form.component.html</context>
@@ -1269,18 +1269,18 @@
<source>Default View Permissions</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">285</context>
+ <context context-type="linenumber">281</context>
</context-group>
</trans-unit>
<trans-unit id="2191775412581217688" datatype="html">
<source>Users:</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">290</context>
+ <context context-type="linenumber">286</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">317</context>
+ <context context-type="linenumber">313</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html</context>
@@ -1311,11 +1311,11 @@
<source>Groups:</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">300</context>
+ <context context-type="linenumber">296</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">327</context>
+ <context context-type="linenumber">323</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html</context>
@@ -1346,14 +1346,14 @@
<source>Default Edit Permissions</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">312</context>
+ <context context-type="linenumber">308</context>
</context-group>
</trans-unit>
<trans-unit id="3728984448750213892" datatype="html">
<source>Edit permissions also grant viewing permissions</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">336</context>
+ <context context-type="linenumber">332</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html</context>
@@ -1372,7 +1372,7 @@
<source>Notifications</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">344</context>
+ <context context-type="linenumber">340</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.html</context>
@@ -1383,49 +1383,49 @@
<source>Document processing</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">347</context>
+ <context context-type="linenumber">343</context>
</context-group>
</trans-unit>
<trans-unit id="3656786776644872398" datatype="html">
<source>Show notifications when new documents are detected</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">351</context>
+ <context context-type="linenumber">347</context>
</context-group>
</trans-unit>
<trans-unit id="6057053428592387613" datatype="html">
<source>Show notifications when document processing completes successfully</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">352</context>
+ <context context-type="linenumber">348</context>
</context-group>
</trans-unit>
<trans-unit id="370315664367425513" datatype="html">
<source>Show notifications when document processing fails</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">353</context>
+ <context context-type="linenumber">349</context>
</context-group>
</trans-unit>
<trans-unit id="6838309441164918531" datatype="html">
<source>Suppress notifications on dashboard</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">354</context>
+ <context context-type="linenumber">350</context>
</context-group>
</trans-unit>
<trans-unit id="2741919327232918179" datatype="html">
<source>This will suppress all messages about document processing status on the dashboard.</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">354</context>
+ <context context-type="linenumber">350</context>
</context-group>
</trans-unit>
<trans-unit id="2159130950882492111" datatype="html">
<source>Cancel</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
- <context context-type="linenumber">365</context>
+ <context context-type="linenumber">361</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/common/confirm-dialog/confirm-dialog.component.ts</context>
diff --git a/src-ui/src/app/components/admin/settings/settings.component.html b/src-ui/src/app/components/admin/settings/settings.component.html
index b8a46e57e..9d235a0f3 100644
--- a/src-ui/src/app/components/admin/settings/settings.component.html
+++ b/src-ui/src/app/components/admin/settings/settings.component.html
@@ -118,7 +118,7 @@
</div>
</div>
- <div class="row mb-3">
+ <div class="row">
<div class="col-md-3 col-form-label pt-0">
<span i18n>Sidebar</span>
</div>
@@ -129,7 +129,7 @@
</div>
</div>
- <div class="row mb-3">
+ <div class="row">
<div class="col-md-3 col-form-label pt-0">
<span i18n>Dark mode</span>
</div>
@@ -165,7 +165,7 @@
<p i18n>
Update checking works by pinging the public GitHub API for the latest release to determine whether a new version is available. Actual updating of the app must still be performed manually.
</p>
- <p>
+ <p class="mb-0">
<em i18n>No tracking data is collected by the app in any way.</em>
</p>
</ng-template>
@@ -173,7 +173,7 @@
</div>
<h5 class="mt-3" i18n>Saved Views</h5>
- <div class="row mb-3">
+ <div class="row">
<div class="col">
<pngx-input-check i18n-title title="Show warning when closing saved views with unsaved changes" formControlName="savedViewsWarnOnUnsavedChange"></pngx-input-check>
</div>
@@ -183,15 +183,15 @@
<div class="col-xl-6 ps-xl-5">
<h5 class="mt-3 mt-md-0" i18n>Document editing</h5>
- <div class="row mb-3">
+ <div class="row">
<div class="col">
<pngx-input-check i18n-title title="Use PDF viewer provided by the browser" i18n-hint hint="This is usually faster for displaying large PDF documents, but it might not work on some browsers." formControlName="useNativePdfViewer"></pngx-input-check>
</div>
</div>
- <div class="row mb-3">
- <div class="col-2">
- <span i18n>Default zoom:</span>
+ <div class="row">
+ <div class="col-md-3 col-form-label pt-0">
+ <span i18n>Default zoom</span>
</div>
<div class="col">
<select class="form-select" formControlName="pdfViewerDefaultZoom">
@@ -202,7 +202,7 @@
</div>
</div>
- <div class="row mb-3">
+ <div class="row">
<div class="col">
<pngx-input-check i18n-title title="Automatically remove inbox tag(s) on save" formControlName="documentEditingRemoveInboxTags"></pngx-input-check>
</div>
@@ -214,10 +214,22 @@
</div>
</div>
- <h5 class="mt-3" i18n>Notes</h5>
- <div class="row mb-3">
+ <h5 class="mt-3" i18n>Global search</h5>
+ <div class="row">
<div class="col">
- <pngx-input-check i18n-title title="Enable notes" formControlName="notesEnabled"></pngx-input-check>
+ <pngx-input-check i18n-title title="Do not include advanced search results" formControlName="searchDbOnly"></pngx-input-check>
+ </div>
+ </div>
+
+ <div class="row mb-3">
+ <div class="col-md-3 col-form-label pt-0">
+ <span i18n>Full search links to</span>
+ </div>
+ <div class="col mb-3">
+ <select class="form-select" formControlName="searchLink">
+ <option [ngValue]="GlobalSearchType.TITLE_CONTENT" i18n>Title and content search</option>
+ <option [ngValue]="GlobalSearchType.ADVANCED" i18n>Advanced search</option>
+ </select>
</div>
</div>
@@ -229,26 +241,10 @@
</div>
</div>
- <h5 class="mt-3" i18n>Global search</h5>
+ <h5 class="mt-3" i18n>Notes</h5>
<div class="row mb-3">
<div class="col">
- <pngx-input-check i18n-title title="Do not include advanced search results" formControlName="searchDbOnly"></pngx-input-check>
- </div>
- </div>
-
- <div class="row mb-3">
- <div class="col">
- <div class="row">
- <div class="col-md-3 col-form-label pt-0">
- <span i18n>Full search links to</span>
- </div>
- <div class="col">
- <select class="form-select" formControlName="searchLink">
- <option [ngValue]="GlobalSearchType.TITLE_CONTENT" i18n>Title and content search</option>
- <option [ngValue]="GlobalSearchType.ADVANCED" i18n>Advanced search</option>
- </select>
- </div>
- </div>
+ <pngx-input-check i18n-title title="Enable notes" formControlName="notesEnabled"></pngx-input-check>
</div>
</div>
@@ -267,8 +263,8 @@
<div class="row mb-3">
<div class="col">
<p i18n>
- Settings apply to this user account for objects (Tags, Mail Rules, etc.) created via the web UI
- </p>
+ Settings apply to this user account for objects (Tags, Mail Rules, etc. but not documents) created via the web UI.
+ </p>
</div>
</div>
<div class="row mb-3">
@@ -307,7 +303,7 @@
</div>
</div>
</div>
- <div class="row mb-3">
+ <div class="row">
<div class="col-md-3 col-form-label pt-0">
<span i18n>Default Edit Permissions</span>
</div>
@@ -346,7 +342,7 @@
<h5 i18n>Document processing</h5>
- <div class="row mb-3">
+ <div class="row">
<div class="col">
<pngx-input-check i18n-title title="Show notifications when new documents are detected" formControlName="notificationsConsumerNewDocument"></pngx-input-check>
<pngx-input-check i18n-title title="Show notifications when document processing completes successfully" formControlName="notificationsConsumerSuccess"></pngx-input-check>
diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py
index 78d0043b5..1fd34dd81 100644
--- a/src/documents/signals/handlers.py
+++ b/src/documents/signals/handlers.py
@@ -1002,29 +1002,37 @@ def run_workflows(
added = timezone.localtime(timezone.now())
created = timezone.localtime(overrides.created)
- subject = parse_w_workflow_placeholders(
- action.email.subject,
- correspondent,
- document_type,
- owner_username,
- added,
- filename,
- current_filename,
- created,
- title,
- doc_url,
+ subject = (
+ parse_w_workflow_placeholders(
+ action.email.subject,
+ correspondent,
+ document_type,
+ owner_username,
+ added,
+ filename,
+ current_filename,
+ created,
+ title,
+ doc_url,
+ )
+ if action.email.subject
+ else ""
)
- body = parse_w_workflow_placeholders(
- action.email.body,
- correspondent,
- document_type,
- owner_username,
- added,
- filename,
- current_filename,
- created,
- title,
- doc_url,
+ body = (
+ parse_w_workflow_placeholders(
+ action.email.body,
+ correspondent,
+ document_type,
+ owner_username,
+ added,
+ filename,
+ current_filename,
+ created,
+ title,
+ doc_url,
+ )
+ if action.email.body
+ else ""
)
try:
n_messages = send_email(
@@ -1105,7 +1113,7 @@ def run_workflows(
f"Error occurred parsing webhook params: {e}",
extra={"group": logging_group},
)
- else:
+ elif action.webhook.body:
data = parse_w_workflow_placeholders(
action.webhook.body,
correspondent,