Merge pull request #101 from plone/principal-fix

Allow principal in sys_metadata with ArchivistTool init
plone · Oct 4, 2023 · 6e4cade · 6e4cade
2 parents 254a2ed + 5d0fe68
commit 6e4cade
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Products/CMFEditions/ArchivistTool.py b/Products/CMFEditions/ArchivistTool.py
@@ -455,7 +455,7 @@ def __init__(
         sys_metadata["comment"] = sys_metadata.get("comment", "")
         sys_metadata["timestamp"] = sys_metadata.get("timestamp", int(time.time()))
         sys_metadata["originator"] = sys_metadata.get("originator", None)
-        sys_metadata["principal"] = getUserId()
+        sys_metadata["principal"] = sys_metadata.get("principal", getUserId())
         sys_metadata["approxSize"] = approxSize
         sys_metadata["parent"] = {
             "history_id": portal_uidhandler.register(parent),

diff --git a/news/101.bugfix b/news/101.bugfix
@@ -0,0 +1 @@
+Allow principal in sys_metadata with ArchivistTool init
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Allow principal in sys_metadata with ArchivistTool init