Ordenar mejor ejercicios.

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

diff --git a/sercom/menu.py b/sercom/menu.py
index a72d6a29bebf04bb98737bc6a19bc10682f75f0d..1d90c8929ee649adede1e9b01fc55a69854f6895 100644 (file)
--- a/sercom/menu.py
+++ b/sercom/menu.py
@@ -1,27 +1,31 @@
+# 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):
         self.base = base
-        self.items = filter(lambda i: isinstance(getattr(base, i), Controller), base.__dict__)
+        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):
+        if hasattr(c, 'hide_to_admin') and 'admin' in identity.current.permissions: return False
+        if hasattr(c, 'hide_to_entregar') and 'admin' not in identity.current.permissions: return False
         return c.require.eval_with_object(identity.current)
 
     def __repr__(self):
         option = u"""<option value="%s">%s</option>" """
         template = """
         <div id="navbar">
-                       Ir a :
-                       <select OnChange="window.location=this.options[this.selectedIndex].value;">
-                               %s
-                       </select>
-               </div>
+                Ir a :
+                <select OnChange="window.location=this.options[this.selectedIndex].value;">
+                    %s
+                </select>
+            </div>
         """
         s = option % ('', '-----')
         for i in self.items: