Bugfix: Comando debe ser Inheritable.

[software/sercom.git] / sercom / menu.py

diff --git a/sercom/menu.py b/sercom/menu.py
index acaf4989872b033e78b3ab4c5fc183e68c924a0e..a72d6a29bebf04bb98737bc6a19bc10682f75f0d 100644 (file)
--- a/sercom/menu.py
+++ b/sercom/menu.py
@@ -1,12 +1,17 @@
 
 from turbogears import url
 from turbogears.controllers import Controller
 
 from turbogears import url
 from turbogears.controllers import Controller

+from turbogears import identity

 
 class Menu:
     def __init__(self, base):
 
 class Menu:
     def __init__(self, base):

-        # Armo la lista de subcontrollers
+        self.base = base

         self.items = filter(lambda i: isinstance(getattr(base, i), Controller), base.__dict__)
         self.items.sort()
         self.items = filter(lambda i: isinstance(getattr(base, i), Controller), base.__dict__)
         self.items.sort()

+        self.items = ['dashboard'] + self.items
+
+    def _check(self, c):
+        return c.require.eval_with_object(identity.current)

 
     def __repr__(self):
         option = u"""<option value="%s">%s</option>" """
 
     def __repr__(self):
         option = u"""<option value="%s">%s</option>" """


@@ -18,8 +23,9 @@ class Menu:
                        </select>
                </div>
         """
                        </select>
                </div>
         """

-        s = ''
+        s = option % ('', '-----')

         for i in self.items:
         for i in self.items:

-            s + = option % (url('/' + i), i.capitalize().replace('_', ' '))
-        return t % s
+            if i == 'dashboard' or self._check(getattr(self.base, i)):
+                s += option % (url('/' + i), i.capitalize().replace('_', ' '))
+        return template % s