From 26a21a12d5d497c24bf5be27d37450b1ebbdf1f1 Mon Sep 17 00:00:00 2001
From: Gil Forcada <gforcada@gnome.org>
Date: Thu, 7 Apr 2016 18:30:30 +0200
Subject: [PATCH] Reindex comments when they are modified

---
 CHANGES.rst                                | 3 ++-
 plone/app/discussion/browser/comment.py    | 4 ++++
 plone/app/discussion/subscribers.py        | 2 +-
 plone/app/discussion/subscribers.zcml      | 6 ++++++
 plone/app/discussion/tests/test_catalog.py | 9 +++++++++
 5 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 894e27f..983dc9f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,7 +10,8 @@ Breaking changes:
 
 New features:
 
-- *add item here*
+- Reindex comments when they are modified.
+  [gforcada]
 
 Bug fixes:
 
diff --git a/plone/app/discussion/browser/comment.py b/plone/app/discussion/browser/comment.py
index 9f22d93..6b9b5d3 100644
--- a/plone/app/discussion/browser/comment.py
+++ b/plone/app/discussion/browser/comment.py
@@ -12,6 +12,8 @@ from Products.statusmessages.interfaces import IStatusMessage
 from z3c.form import button
 from zope.component import getMultiAdapter
 from zope.component import getUtility
+from zope.event import notify
+from zope.lifecycleevent import ObjectModifiedEvent
 
 
 class View(BrowserView):
@@ -91,6 +93,8 @@ class EditCommentForm(CommentForm):
 
         # Update text
         self.context.text = data['text']
+        # Notify that the object has been modified
+        notify(ObjectModifiedEvent(self.context))
 
         # Redirect to comment
         IStatusMessage(self.request).add(_(u'comment_edit_notification',
diff --git a/plone/app/discussion/subscribers.py b/plone/app/discussion/subscribers.py
index 9663243..c3717e5 100644
--- a/plone/app/discussion/subscribers.py
+++ b/plone/app/discussion/subscribers.py
@@ -3,7 +3,7 @@ from Products.CMFCore.utils import getToolByName
 
 
 def index_object(obj, event):
-    """Index the object when it is added to the conversation.
+    """Index the object when it is added/modified to the conversation.
     """
     catalog = getToolByName(obj, 'portal_catalog')
     return catalog.reindexObject(obj)
diff --git a/plone/app/discussion/subscribers.zcml b/plone/app/discussion/subscribers.zcml
index befc5f3..5bb3535 100644
--- a/plone/app/discussion/subscribers.zcml
+++ b/plone/app/discussion/subscribers.zcml
@@ -39,6 +39,12 @@
         handler=".subscribers.index_object"
         />
 
+    <subscriber
+        for="plone.app.discussion.interfaces.IComment
+             zope.lifecycleevent.interfaces.IObjectModifiedEvent"
+        handler=".subscribers.index_object"
+        />
+
     <subscriber
         for="plone.app.discussion.interfaces.IComment
              zope.lifecycleevent.interfaces.IObjectRemovedEvent"
diff --git a/plone/app/discussion/tests/test_catalog.py b/plone/app/discussion/tests/test_catalog.py
index 9cfcbfc..91b4c62 100644
--- a/plone/app/discussion/tests/test_catalog.py
+++ b/plone/app/discussion/tests/test_catalog.py
@@ -9,6 +9,8 @@ from plone.app.testing import TEST_USER_ID
 from Products.CMFCore.utils import getToolByName
 from zope.annotation.interfaces import IAnnotations
 from zope.component import createObject
+from zope.event import notify
+from zope.lifecycleevent import ObjectModifiedEvent
 
 import transaction
 import unittest2 as unittest
@@ -329,6 +331,13 @@ class CommentCatalogTest(unittest.TestCase):
         ))
         self.assertEqual(len(brains), 0)
 
+    def test_reindex_comment(self):
+        # Make sure a comment is reindexed on the catalog when is modified
+        self.comment.text = 'Another text'
+        notify(ObjectModifiedEvent(self.comment))
+        brains = self.catalog.searchResults(SearchableText='Another text')
+        self.assertEqual(len(brains), 1)
+
     def test_remove_comments_when_content_object_is_removed(self):
         """Make sure all comments are removed from the catalog, if the content
            object is removed.