Bugfix: Curso() ponía mal el número de ejercicio.

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

diff --git a/sercom/menu.py b/sercom/menu.py
index acaf4989872b033e78b3ab4c5fc183e68c924a0e..da714d168c7a10c2ac8ee6e73b01c421f5f94346 100644 (file)
--- a/sercom/menu.py
+++ b/sercom/menu.py
@@ -1,12 +1,19 @@
+# vim: set et sw=4 sts=4 encoding=utf-8 foldmethod=marker :
 
 from turbogears import url
-from turbogears.controllers import Controller
+from turbogears.identity import SecureResource
+from turbogears import identity
 
 class Menu:
     def __init__(self, base):
-        # Armo la lista de subcontrollers
-        self.items = filter(lambda i: isinstance(getattr(base, i), Controller), base.__dict__)
+        self.base = base
+        self.items = [i for i in dir(base)
+            if isinstance(getattr(base, i), SecureResource)]
         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>" """
@@ -18,8 +25,9 @@ class Menu:
                        </select>
                </div>
         """
-        s = ''
+        s = option % ('', '-----')
         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