Fix merge

This commit is contained in:
shamoon 2024-12-02 18:54:58 -08:00
parent ed442d9ea1
commit 7b2e3fd840

View File

@ -927,6 +927,7 @@ def run_workflows(
document_type = document.document_type.name if document.document_type else ""
owner_username = document.owner.username if document.owner else ""
filename = document.original_filename or ""
current_filename = document.filename or ""
added = timezone.localtime(document.added)
created = timezone.localtime(document.created)
subject = parse_w_workflow_placeholders(
@ -936,6 +937,7 @@ def run_workflows(
owner_username,
added,
filename,
current_filename,
created,
title,
doc_url,
@ -947,6 +949,7 @@ def run_workflows(
owner_username,
added,
filename,
current_filename,
created,
title,
doc_url,
@ -983,6 +986,7 @@ def run_workflows(
document_type = document.document_type.name if document.document_type else ""
owner_username = document.owner.username if document.owner else ""
filename = document.original_filename or ""
current_filename = document.filename or ""
added = timezone.localtime(document.added)
created = timezone.localtime(document.created)
@ -998,6 +1002,7 @@ def run_workflows(
owner_username,
added,
filename,
current_filename,
created,
title,
doc_url,
@ -1015,6 +1020,7 @@ def run_workflows(
owner_username,
added,
filename,
current_filename,
created,
title,
doc_url,