[Checkins] SVN: megrok.menu/branches/fixes-for-grok0.14/src/megrok/menu/ Add the extra parameter to megrok.menu.menuitem directive

[Santiago Videla]

Log message for revision 94067:
  Add the extra parameter to megrok.menu.menuitem directive
  
  

Changed:
  U   megrok.menu/branches/fixes-for-grok0.14/src/megrok/menu/component.py
  U   megrok.menu/branches/fixes-for-grok0.14/src/megrok/menu/grokker.py

-=-
Modified: megrok.menu/branches/fixes-for-grok0.14/src/megrok/menu/component.py
===================================================================
--- megrok.menu/branches/fixes-for-grok0.14/src/megrok/menu/component.py	2008-12-14 21:59:49 UTC (rev 94066)
+++ megrok.menu/branches/fixes-for-grok0.14/src/megrok/menu/component.py	2008-12-15 01:26:42 UTC (rev 94067)
@@ -14,12 +14,12 @@
     scope = martian.CLASS
     store = martian.ONCE
 
-    def factory(self, menu, icon=None, filter=None, order=0):
+    def factory(self, menu, icon=None, filter=None, order=0, extra=None):
         if martian.util.check_subclass(menu, Menu):
             menu = grokcore.component.name.bind().get(menu)
         if martian.util.not_unicode_or_ascii(menu):
             raise GrokImportError(
                 "You can only pass unicode, ASCII, or a subclass "
                 "of megrok.menu.Menu to the '%s' directive." % self.name)
-        return (menu, icon, filter, order)
+        return (menu, icon, filter, order, extra)
 

Modified: megrok.menu/branches/fixes-for-grok0.14/src/megrok/menu/grokker.py
===================================================================
--- megrok.menu/branches/fixes-for-grok0.14/src/megrok/menu/grokker.py	2008-12-14 21:59:49 UTC (rev 94066)
+++ megrok.menu/branches/fixes-for-grok0.14/src/megrok/menu/grokker.py	2008-12-15 01:26:42 UTC (rev 94067)
@@ -52,7 +52,7 @@
         if menuitem is None:
             return False
 
-        menu_id, icon, filter, order = menuitem
+        menu_id, icon, filter, order, extra = menuitem
         try:
             menu = config.resolve('zope.app.menus.'+menu_id)
         except ConfigurationError, v:
@@ -63,7 +63,7 @@
         subMenuItemDirective(config, menu=menu, for_=context, submenu=name,
                           title=title, description=description, icon=icon,
                           filter=filter, permission=permission, layer=layer,
-                          order=order, action='')
+                          order=order, action='', extra=extra)
 
         for method_name in IBrowserPage:
             if method_name == '__call__':
@@ -89,7 +89,7 @@
 
         if menuitem is None:
             return False
-        menu_id, icon, filter, order = menuitem
+        menu_id, icon, filter, order, extra = menuitem
         try:
             menu = config.resolve('zope.app.menus.'+menu_id)
         except ConfigurationError, v:
@@ -99,7 +99,7 @@
         menuItemDirective(config, menu=menu, for_=context, action=name,
                           title=title, description=description, icon=icon,
                           filter=filter, permission=permission, layer=layer,
-                          order=order)
+                          order=order, extra=extra)
 
         # Menu items check whether the view that they refer to can be
         # traversed to.  Unfortunately, views will end up being