[CMF-checkins] CVS: CMF/CMFCore - WorkflowTool.py:1.24.4.11

[Florent Guillaume]

Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv14127/CMFCore

Modified Files:
      Tag: CMF-1_3-branch
	WorkflowTool.py 
Log Message:
Merge from HEAD:
Ensure that the security attributes are reindexed on all subobjects too
when a folderish object changes state in the workflow (Collector #115).



=== CMF/CMFCore/WorkflowTool.py 1.24.4.10 => 1.24.4.11 ===
--- CMF/CMFCore/WorkflowTool.py:1.24.4.10	Sun Aug  4 19:33:30 2002
+++ CMF/CMFCore/WorkflowTool.py	Fri Mar 14 14:13:45 2003
@@ -692,6 +692,8 @@
     def _reindexWorkflowVariables(self, ob):
 
         """ Reindex the variables that the workflow may have changed.
+
+        Also reindexes the security.
         """
         if not self._default_cataloging:
             return
@@ -699,9 +701,12 @@
         if hasattr(aq_base(ob), 'reindexObject'):
             # XXX We only need the keys here, no need to compute values.
             mapping = self.getCatalogVariablesFor(ob) or {}
-            mapping['allowedRolesAndUsers'] = None
             vars = mapping.keys()
             ob.reindexObject(idxs=vars)
+
+        # Reindex security of subobjects.
+        if hasattr(aq_base(ob), 'reindexObjectSecurity'):
+            ob.reindexObjectSecurity()
 
 InitializeClass(WorkflowTool)