[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/ - Discussion tool: Removed the listActions method that would return

[Jens Vagelpohl]

Log message for revision 91748:
  - Discussion tool: Removed the listActions method that would return
    a hardcoded Reply action. This action has been handled by the
    Actions tool itself for a while now, and the Discussions tool was
    not set as an action provider anymore.
  

Changed:
  U   Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
  U   Products.CMFCore/trunk/Products/CMFCore/DiscussionTool.py

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt	2008-10-04 14:23:32 UTC (rev 91747)
+++ Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt	2008-10-04 14:44:27 UTC (rev 91748)
@@ -4,6 +4,11 @@
 2.2.0 (unreleased)
 ------------------
 
+- Discussion tool: Removed the listActions method that would return 
+  a hardcoded Reply action. This action has been handled by the
+  Actions tool itself for a while now, and the Discussions tool was 
+  not set as an action provider anymore.
+
 - actions tool export/import: The actions tool export/import mechanism 
   is no longer attempting to handle actions stored on tools other than
   itself. Other tools are themselves responsible for their actions.

Modified: Products.CMFCore/trunk/Products/CMFCore/DiscussionTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/DiscussionTool.py	2008-10-04 14:23:32 UTC (rev 91747)
+++ Products.CMFCore/trunk/Products/CMFCore/DiscussionTool.py	2008-10-04 14:44:27 UTC (rev 91748)
@@ -156,29 +156,4 @@
             return typeInfo.allowDiscussion()
         return 0
 
-    security.declarePrivate('listActions')
-    def listActions(self, info=None, object=None):
-        # Return actions for reply and show replies
-        if object is not None or info is None:
-            info = self._getOAI(object)
-        content = info.object
-        if content is None or not self.isDiscussionAllowedFor(content):
-            return ()
-
-        discussion = self.getDiscussionFor(content)
-        if discussion.aq_base == content.aq_base:
-            discussion_url = info.object_url
-        else:
-            discussion_url = discussion.absolute_url()
-
-        actions = (
-            {'name': 'Reply',
-             'url': discussion_url + '/discussion_reply_form',
-             'permissions': [ReplyToItem],
-             'category': 'object'
-             },
-            )
-
-        return actions
-
 InitializeClass(DiscussionTool)