Fix DeactivatedCatalogIndexing context-manager.

Because collective.indexing will still be adding indexing operations
to the indexing queue, and our patch will only apply when the queue is
processed, we need to make sure to process the queue when
entering this context manager so that items already in the queue get
processed correctly, and before exiting the context manager so that
indexing of queued items really gets skipped.

opengever/base/monkey/patches/cmf_catalog_aware.py

@@ -1,3 +1,4 @@
+from collective.indexing.queue import processQueue
 from opengever.base import _
 from opengever.base.monkey.patching import MonkeyPatch
 from opengever.base.role_assignments import RoleAssignmentManager
@@ -7,7 +8,6 @@
 from zope.interface import alsoProvides
 from zope.interface import Interface
 from zope.interface import noLongerProvides
-from zope.i18n import translate
 
 
 class IDisableCatalogIndexing(Interface):
@@ -24,11 +24,22 @@ class IDisableCatalogIndexing(Interface):
 
 class DeactivatedCatalogIndexing(object):
     """Contextmanager: Deactivates catalog-indexing
+
+    Because collective.indexing will still be adding indexing operations
+    to the indexing queue, and our patch will only apply when the queue is
+    processed. This is why we need to make sure to process the queue when
+    entering this context manager so that items already in the queue get
+    processed correctly, and before exiting the context manager so that
+    indexing of queued items really gets skipped.
     """
     def __enter__(self):
+        # Because collective indexing will still be adding the indexing
+        # operations in the queue
+        processQueue()
         alsoProvides(getRequest(), IDisableCatalogIndexing)
 
     def __exit__(self, exc_type, exc_val, exc_tb):
+        processQueue()
         noLongerProvides(getRequest(), IDisableCatalogIndexing)