Bugfix: eliminar variable extraña siempre.

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

diff --git a/sercom/menu.py b/sercom/menu.py
index 59c527f50db0a837e884a12d0ad2c03121cc9174..beb4f57783d38b33a4624807057cbe3451c47dae 100644 (file)
--- a/sercom/menu.py
+++ b/sercom/menu.py
@@ -1,15 +1,20 @@
+# vim: set et sw=4 sts=4 encoding=utf-8 foldmethod=marker :

 
 from turbogears import url
 
 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
 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.sort()

+        self.items = ['dashboard'] + self.items

 
     def _check(self, c):
 
     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):
         return c.require.eval_with_object(identity.current)
 
     def __repr__(self):


@@ -24,7 +29,7 @@ class Menu:
         """
         s = option % ('', '-----')
         for i in self.items:
         """
         s = option % ('', '-----')
         for i in self.items:

-            if self._check(getattr(self.base, i)):
+            if i == 'dashboard' or self._check(getattr(self.base, i)):

                 s += option % (url('/' + i), i.capitalize().replace('_', ' '))
         return template % s
 
                 s += option % (url('/' + i), i.capitalize().replace('_', ' '))
         return template % s