mirror of
https://github.com/paperless-ngx/paperless-ngx.git
synced 2025-11-17 04:16:54 -06:00
Fix: include BASE_URL when constructing doc_url for workflows (#11360)
--------- Co-authored-by: shamoon <4887959+shamoon@users.noreply.github.com>
This commit is contained in:
@@ -1095,7 +1095,9 @@ def run_workflows(
|
|||||||
|
|
||||||
if not use_overrides:
|
if not use_overrides:
|
||||||
title = document.title
|
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 = (
|
correspondent = (
|
||||||
document.correspondent.name if document.correspondent else ""
|
document.correspondent.name if document.correspondent else ""
|
||||||
)
|
)
|
||||||
@@ -1212,7 +1214,9 @@ def run_workflows(
|
|||||||
def webhook_action():
|
def webhook_action():
|
||||||
if not use_overrides:
|
if not use_overrides:
|
||||||
title = document.title
|
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 = (
|
correspondent = (
|
||||||
document.correspondent.name if document.correspondent else ""
|
document.correspondent.name if document.correspondent else ""
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -3212,6 +3212,8 @@ class TestWorkflows(
|
|||||||
|
|
||||||
@override_settings(
|
@override_settings(
|
||||||
PAPERLESS_URL="http://localhost:8000",
|
PAPERLESS_URL="http://localhost:8000",
|
||||||
|
PAPERLESS_FORCE_SCRIPT_NAME="/paperless",
|
||||||
|
BASE_URL="/paperless/",
|
||||||
)
|
)
|
||||||
@mock.patch("documents.signals.handlers.send_webhook.delay")
|
@mock.patch("documents.signals.handlers.send_webhook.delay")
|
||||||
def test_workflow_webhook_action_body(self, mock_post):
|
def test_workflow_webhook_action_body(self, mock_post):
|
||||||
@@ -3263,7 +3265,7 @@ class TestWorkflows(
|
|||||||
|
|
||||||
mock_post.assert_called_once_with(
|
mock_post.assert_called_once_with(
|
||||||
url="http://paperless-ngx.com",
|
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={},
|
headers={},
|
||||||
files=None,
|
files=None,
|
||||||
as_json=False,
|
as_json=False,
|
||||||
|
|||||||
Reference in New Issue
Block a user