Seteo bien la contraseña e incluyo Rol que faltaba

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

diff --git a/sercom/controllers.py b/sercom/controllers.py
index d1f2e18d08a6d3862dd0599d1b5858ddb8f72bb3..849d25cb94f9cca2b2fb98b7eb2f824cd48169af 100644 (file)
--- a/sercom/controllers.py
+++ b/sercom/controllers.py
@@ -1,9 +1,11 @@
-# vim: set et sw=4 sts=4 encoding=utf-8 :
+# vim: set et sw=4 sts=4 encoding=utf-8 foldmethod=marker :

 
 from turbogears import controllers, expose, view, url
 from turbogears import widgets as W, validators as V
 from turbogears import identity, redirect
 from cherrypy import request, response
 
 from turbogears import controllers, expose, view, url
 from turbogears import widgets as W, validators as V
 from turbogears import identity, redirect
 from cherrypy import request, response

+from turbogears.toolbox.catwalk import CatWalk
+import model

 from model import InstanciaDeEntrega, Correccion, AND, DateTimeCol
 # from sercom import json
 
 from model import InstanciaDeEntrega, Correccion, AND, DateTimeCol
 # from sercom import json
 


@@ -35,7 +37,7 @@ class Root(controllers.RootController):
         if 'admin' in identity.current.permissions:
             # TODO : Fijar el curso !!
             correcciones = Correccion.selectBy(corrector=identity.current.user,
         if 'admin' in identity.current.permissions:
             # TODO : Fijar el curso !!
             correcciones = Correccion.selectBy(corrector=identity.current.user,

-                nota=None).count()
+                corregido=None).count()

             now = DateTimeCol.now()
             instancias = list(InstanciaDeEntrega.select(
                 AND(InstanciaDeEntrega.q.inicio <= now,
             now = DateTimeCol.now()
             instancias = list(InstanciaDeEntrega.select(
                 AND(InstanciaDeEntrega.q.inicio <= now,


@@ -109,6 +111,7 @@ class Root(controllers.RootController):
 
     correccion = CorreccionController()
 
 
     correccion = CorreccionController()
 

+    admin = identity.SecureObject(CatWalk(model), identity.has_permission('admin'))

 
 #{{{ Agrega summarize a namespace tg de KID
 def summarize(text, size, concat=True, continuation='...'):
 
 #{{{ Agrega summarize a namespace tg de KID
 def summarize(text, size, concat=True, continuation='...'):