Merge pull request #3 from pjstevns/master
Fix for broken indexing when clear-and-rebuild catalog.
This commit is contained in:
commit
7dc3e0c6f9
2
dev.cfg
2
dev.cfg
@ -61,7 +61,7 @@ output = ${buildout:directory}/bin/sphinxupload
|
||||
mode = 755
|
||||
|
||||
[sources]
|
||||
collective.akismet = svn https://svn.plone.org/svn/collective/collective.autoresizetextarea/trunk
|
||||
collective.akismet = svn https://svn.plone.org/svn/collective/collective.akismet/trunk
|
||||
collective.autoresizetextarea = svn https://svn.plone.org/svn/collective/collective.autoresizetextarea/trunk
|
||||
collective.z3cform.norobots = svn https://svn.plone.org/svn/collective/collective.z3cform.norobots/trunk
|
||||
plone.formwidget.captcha = svn https://svn.plone.org/svn/plone/plone.formwidget.captcha/trunk/
|
||||
|
@ -1,13 +1,14 @@
|
||||
from Acquisition import aq_inner, aq_base, aq_parent
|
||||
from zope.component import queryUtility
|
||||
|
||||
from Acquisition import aq_inner, aq_parent
|
||||
|
||||
from zope.annotation.interfaces import IAnnotations
|
||||
|
||||
from Products.CMFPlone.utils import base_hasattr
|
||||
from Products.CMFPlone.utils import safe_callable
|
||||
|
||||
from Products.CMFCore.utils import getToolByName
|
||||
|
||||
from plone.app.discussion.conversation import ANNOTATION_KEY
|
||||
from plone.app.discussion.interfaces import ICommentingTool
|
||||
|
||||
# security.declareProtected(ManageZCatalogEntries, 'clearFindAndRebuild')
|
||||
def patchedClearFindAndRebuild(self):
|
||||
@ -25,14 +26,14 @@ def patchedClearFindAndRebuild(self):
|
||||
obj.indexObject()
|
||||
|
||||
annotions = IAnnotations(obj)
|
||||
catalog = getToolByName(obj, 'portal_catalog', None)
|
||||
discussion = queryUtility(ICommentingTool)
|
||||
if ANNOTATION_KEY in annotions:
|
||||
conversation = annotions[ANNOTATION_KEY]
|
||||
conversation = conversation.__of__(obj)
|
||||
for comment in conversation.getComments():
|
||||
try:
|
||||
if catalog:
|
||||
catalog.indexObject(aq_base(comment))
|
||||
if discussion:
|
||||
discussion.indexObject(comment)
|
||||
except StopIteration: # pragma: no cover
|
||||
pass
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user