Bugfix: arreglar validadores personalizados de SQLObject.

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

diff --git a/sercom/menu.py b/sercom/menu.py
index 5a2e6b9b689ba859f1ac638a003ef626d0d26d0c..a72d6a29bebf04bb98737bc6a19bc10682f75f0d 100644 (file)
--- a/sercom/menu.py
+++ b/sercom/menu.py
@@ -1,18 +1,21 @@
 
 from turbogears import url
 
 from turbogears import url

-from turbogears import controllers
+from turbogears.controllers import Controller
+from turbogears import identity

 
 class Menu:
 
 class Menu:

-    def __init__(self, controller):
-        # Armo la lista de subcontrollers
-        self.items = []
-        for i in controller.__dict__:
-            if isinstance(getattr(controller, i),controllers.Controller):
-                self.items.append(i)
+    def __init__(self, base):
+        self.base = base
+        self.items = filter(lambda i: isinstance(getattr(base, i), Controller), base.__dict__)

         self.items.sort()
         self.items.sort()

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

 
     def __repr__(self):
 
     def __repr__(self):

-        t = """
+        option = u"""<option value="%s">%s</option>" """
+        template = """

         <div id="navbar">
                        Ir a :
                        <select OnChange="window.location=this.options[this.selectedIndex].value;">
         <div id="navbar">
                        Ir a :
                        <select OnChange="window.location=this.options[this.selectedIndex].value;">


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

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

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

-            s = s + u"""<option value="%s">%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