[z3-checkins] r8340 - z3/CMFonFive/branch/regebro-action_menus

[regebro at codespeak.net]

Author: regebro
Date: Mon Jan 17 17:24:32 2005
New Revision: 8340

Modified:
   z3/CMFonFive/branch/regebro-action_menus/fiveactionstool.py
Log:
There is no object parameter to listActions. I have no idea where I got that idea from.

Modified: z3/CMFonFive/branch/regebro-action_menus/fiveactionstool.py
==============================================================================
--- z3/CMFonFive/branch/regebro-action_menus/fiveactionstool.py	(original)
+++ z3/CMFonFive/branch/regebro-action_menus/fiveactionstool.py	Mon Jan 17 17:24:32 2005
@@ -32,11 +32,12 @@
         return self.REQUEST.URL
 
     security.declarePrivate('listActions')
-    def listActions(self, info=None, object=None):
+    def listActions(self, info=None):
         """ List all the actions defined by a provider.
         """
         # Necessary to make the Request look like a Zope3 request
         self.REQUEST.getURL = self.getReqestURL
+        object = info.content
         actions = []
         for mid in globalBrowserMenuService._registry.keys():
             menu = globalBrowserMenuService.getMenu(mid, object, self.REQUEST)
@@ -45,6 +46,7 @@
                 # Set the action category to the menu name (not unicode!)
                 act['category'] = str(mid)
                 act['url'] = str(entry['action'])
+                act['id'] = act['url']
                 # The action needs a unique name, so I'll build one
                 # from the object_id and the action url. That is sure
                 # to be unique.