[Testbot] Plone 4.3 - Python 2.6 - Build # 1930 - Fixed! - 0 failure(s)

[jenkins at plone.org]

-------------------------------------------------------------------------------
Plone 4.3 - Python 2.6 - Build # 1930 - Fixed!
-------------------------------------------------------------------------------

http://jenkins.plone.org/job/plone-4.3-python-2.6/1930/


-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------

Repository: Products.CMFPlone
Branch: refs/heads/4.3.x
Date: 2014-04-02T07:30:22+02:00
Author: tisto (tisto) <tisto at plone.org>
Commit: https://github.com/plone/Products.CMFPlone/commit/d33cdd315b6c070c90aff26d88e01f3d1959943f

Revert "Override _recursiveUpdateRoleMappings function of WorkflowTool of CMFCore. This so we can prevent it from updating the metadata which slows down the process considerably and is unneeded"

This reverts commit 0d20a96901cdb0d6c8a93f8b64b6926e40b416ac.

This commit broke the 4.3 build: http://jenkins.plone.org/job/plone-4.3-python-2.7/2119/

Conflicts:
	Products/CMFPlone/WorkflowTool.py

Files changed:
M Products/CMFPlone/WorkflowTool.py
M docs/CHANGES.rst

diff --git a/Products/CMFPlone/WorkflowTool.py b/Products/CMFPlone/WorkflowTool.py
index b0a4039..3d812a7 100644
--- a/Products/CMFPlone/WorkflowTool.py
+++ b/Products/CMFPlone/WorkflowTool.py
@@ -350,46 +350,6 @@ def listActions(self, info=None, object=None):
                     actions.extend(a)
         return actions
 
-    security.declarePrivate( '_recursiveUpdateRoleMappings' )
-    def _recursiveUpdateRoleMappings(self, ob, wfs):
-
-        """ Update roles-permission mappings recursively, and
-            reindex special index.
-        """
-        # Returns a count of updated objects.
-        count = 0
-        wf_ids = self.getChainFor(ob)
-        if wf_ids:
-            changed = 0
-            for wf_id in wf_ids:
-                wf = wfs.get(wf_id, None)
-                if wf is not None:
-                    did = wf.updateRoleMappingsFor(ob)
-                    if did:
-                        changed = 1
-            if changed:
-                count = count + 1
-                if hasattr(aq_base(ob), 'reindexObject'):
-                    # Reindex security-related indexes
-                    try:
-                        ob.reindexObject(
-                            idxs=['allowedRolesAndUsers'], 
-                            update_metadata=0
-                        )
-                    except TypeError:
-                        # Catch attempts to reindex portal_catalog.
-                        pass
-        if hasattr(aq_base(ob), 'objectItems'):
-            obs = ob.objectItems()
-            if obs:
-                for k, v in obs:
-                    changed = getattr(v, '_p_changed', 0)
-                    count = count + self._recursiveUpdateRoleMappings(v, wfs)
-                    if changed is None:
-                        # Re-ghostify.
-                        v._p_deactivate()
-        return count
-
 WorkflowTool.__doc__ = BaseTool.__doc__
 
 InitializeClass(WorkflowTool)
diff --git a/docs/CHANGES.rst b/docs/CHANGES.rst
index 4688e86..2b7e952 100644
--- a/docs/CHANGES.rst
+++ b/docs/CHANGES.rst
@@ -28,10 +28,6 @@ Changelog
   resources are registered in the portal_css tool
   [keul]
 
-- Override _recursiveUpdateRoleMappings of CMFCore WorkflowTool to enhance performance
-  by not updating metadata.
-  [thepjot]
-
 4.3.3 (2014-02-19)
 ------------------
 - Fix incorrect use of dict get method in CatalogTool.search, introduced by




-------------------------------------------------------------------------------