Bugfix: El zip se subía roto en las entregas.

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

diff --git a/sercom/menu.py b/sercom/menu.py
index acaf4989872b033e78b3ab4c5fc183e68c924a0e..bc9fbeed44ff05d0ff44df4940937972259f6a13 100644 (file)
--- a/sercom/menu.py
+++ b/sercom/menu.py
@@ -1,12 +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):
 
 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.sort()

+        self.items = ['dashboard'] + self.items
+
+    def _check(self, c):
+        if hasattr(c, 'hide_to_admin') and 'admin' in identity.current.permissions: return False
+        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 +26,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