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

[regebro at codespeak.net]

Author: regebro
Date: Mon Mar  7 17:20:55 2005
New Revision: 9694

Modified:
   z3/CMFonFive/branch/regebro-action_menus/configure.zcml
   z3/CMFonFive/branch/regebro-action_menus/fiveactionstool.py
Log:
Bugfix + object menu.


Modified: z3/CMFonFive/branch/regebro-action_menus/configure.zcml
==============================================================================
--- z3/CMFonFive/branch/regebro-action_menus/configure.zcml	(original)
+++ z3/CMFonFive/branch/regebro-action_menus/configure.zcml	Mon Mar  7 17:20:55 2005
@@ -15,4 +15,6 @@
   <!-- Make Zope3 assertions about Document class. -->
   <include file="document.zcml" />
 
+  <!-- Set up default menues as action categories. -->
+  <browser:menu id="object" title="Object menu" />
 </configure>

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 Mar  7 17:20:55 2005
@@ -13,9 +13,10 @@
 from Products.CMFCore.Expression import Expression
 from Products.CMFCore.utils import UniqueObject
 
-from Products.Five.globalbrowsermenuservice import \
+from zope.app.publisher.browser.globalbrowsermenuservice import \
      globalBrowserMenuService
-
+from Products.Five import security
+import zope.thread
 
 class FiveActionsTool( UniqueObject, SimpleItem, ActionProviderBase ):
     """ Links content to discussions.
@@ -37,6 +38,7 @@
         """
         # 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():