added uidtool (#23)

Prevents handleUidAnnotationEvent failure if portal_uidhandler is not available
zopefoundation · Sep 22, 2023 · cc41340 · cc41340
1 parent 7317fc7
commit cc41340
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,6 +4,7 @@ Products.CMFUid Changelog
 4.1 (unreleased)
 ----------------
 
+- Modified the code of ``handleUidAnnotationEvent`` to check if both 'anno_tool' and 'uidtool' exist before using them. This change ensures that the code won't run unless both tools are available, preventing the 'NoneType' error.
 
 4.0 (2023-02-01)
 ----------------

diff --git a/src/Products/CMFUid/UniqueIdAnnotationTool.py b/src/Products/CMFUid/UniqueIdAnnotationTool.py
@@ -75,7 +75,7 @@ def handleUidAnnotationEvent(ob, event):
         if event.newParent is not None:
             anno_tool = queryUtility(IUniqueIdAnnotationManagement)
             uidtool = getToolByName(ob, 'portal_uidhandler', None)
-            if anno_tool is not None:
+            if anno_tool is not None and uidtool is not None:
                 remove_on_add = anno_tool.getProperty('remove_on_add', False)
                 remove_on_clone = anno_tool.getProperty('remove_on_clone',
                                                         False)
@@ -95,7 +95,7 @@ def handleUidAnnotationEvent(ob, event):
         anno_tool = queryUtility(IUniqueIdAnnotationManagement)
         uidtool = getToolByName(ob, 'portal_uidhandler', None)
 
-        if anno_tool is not None:
+        if anno_tool is not None and uidtool is not None:
             remove_on_clone = anno_tool.getProperty('remove_on_clone', False)
             assign_on_clone = anno_tool.getProperty('assign_on_clone', False)
             if remove_on_clone or assign_on_clone: