Skip to content

A community-supported supercharged document management system: scan, index and archive all your documents

Fix: include BASE_URL when constructing `doc_url` for workflows (#11360)

Ed Bardsleyc5ad148dc74d
diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py
index a7641ecf2..738ecb086 100644
--- a/src/documents/signals/handlers.py
+++ b/src/documents/signals/handlers.py
@@ -1095,7 +1095,9 @@ def run_workflows(
if not use_overrides:
title = document.title
- doc_url = f"{settings.PAPERLESS_URL}/documents/{document.pk}/"
+ doc_url = (
+ f"{settings.PAPERLESS_URL}{settings.BASE_URL}documents/{document.pk}/"
+ )
correspondent = (
document.correspondent.name if document.correspondent else ""
)
@@ -1212,7 +1214,9 @@ def run_workflows(
def webhook_action():
if not use_overrides:
title = document.title
- doc_url = f"{settings.PAPERLESS_URL}/documents/{document.pk}/"
+ doc_url = (
+ f"{settings.PAPERLESS_URL}{settings.BASE_URL}documents/{document.pk}/"
+ )
correspondent = (
document.correspondent.name if document.correspondent else ""
)
diff --git a/src/documents/tests/test_workflows.py b/src/documents/tests/test_workflows.py
index a2a5aa9c3..6438e4b10 100644
--- a/src/documents/tests/test_workflows.py
+++ b/src/documents/tests/test_workflows.py
@@ -3212,6 +3212,8 @@ class TestWorkflows(
@override_settings(
PAPERLESS_URL="http://localhost:8000",
+ PAPERLESS_FORCE_SCRIPT_NAME="/paperless",
+ BASE_URL="/paperless/",
)
@mock.patch("documents.signals.handlers.send_webhook.delay")
def test_workflow_webhook_action_body(self, mock_post):
@@ -3263,7 +3265,7 @@ class TestWorkflows(
mock_post.assert_called_once_with(
url="http://paperless-ngx.com",
- data=f"Test message: http://localhost:8000/documents/{doc.id}/",
+ data=f"Test message: http://localhost:8000/paperless/documents/{doc.id}/",
headers={},
files=None,
as_json=False,