Excluir /proc al rsync'ear chroot.

[z.facultad/75.52/sercom.git] / sercom / subcontrollers / curso / __init__.py

diff --git a/sercom/subcontrollers/curso/__init__.py b/sercom/subcontrollers/curso/__init__.py
index d73b01beb5aac2c6e37c6bfa572b298f3fc8a838..699bc79b006e658cf74b7b65e233f0c54841403c 100644 (file)
--- a/sercom/subcontrollers/curso/__init__.py
+++ b/sercom/subcontrollers/curso/__init__.py
@@ -10,13 +10,14 @@ from turbogears import identity
 from turbogears import paginate
 from docutils.core import publish_parts
 from sercom.subcontrollers import validate as val
 from turbogears import paginate
 from docutils.core import publish_parts
 from sercom.subcontrollers import validate as val

-from sercom.model import Curso, Correccion, Ejercicio, Alumno, Docente, Grupo, DocenteInscripto
+from sercom.model import Curso, Correccion, Ejercicio, Alumno, Docente, Grupo, DocenteInscripto, Rol

 from curso_alumno import *
 from sqlobject import *
 from sqlobject.dberrors import *
 from sercom.widgets import *
 from alumno import AlumnoInscriptoController
 from grupo import GrupoController
 from curso_alumno import *
 from sqlobject import *
 from sqlobject.dberrors import *
 from sercom.widgets import *
 from alumno import AlumnoInscriptoController
 from grupo import GrupoController

+from ejercicio import EjercicioController

 #}}}
 
 #{{{ Configuración
 #}}}
 
 #{{{ Configuración


@@ -163,6 +164,7 @@ class CursoController(controllers.Controller, identity.SecureResource):
     curso_alumno = CursoAlumnoController()
     alumno = AlumnoInscriptoController()
     grupo = GrupoController()
     curso_alumno = CursoAlumnoController()
     alumno = AlumnoInscriptoController()
     grupo = GrupoController()

+    ejercicio = EjercicioController()

 
     @expose()
     def default(self, tg_errors=None):
 
     @expose()
     def default(self, tg_errors=None):


@@ -177,7 +179,7 @@ class CursoController(controllers.Controller, identity.SecureResource):
     @paginate('records')
     def list(self):
         """List records in model"""
     @paginate('records')
     def list(self):
         """List records in model"""

-        r = cls.select()
+        r = cls.select().orderBy((-cls.q.anio, -cls.q.cuatrimestre, cls.q.numero))

         return dict(records=r, name=name, namepl=namepl)
 
     @expose()
         return dict(records=r, name=name, namepl=namepl)
 
     @expose()


@@ -298,7 +300,7 @@ class CursoController(controllers.Controller, identity.SecureResource):
                 if row == []:
                     continue
                 try:
                 if row == []:
                     continue
                 try:

-                    u = Alumno(row[0], nombre=row[1])
+                    u = Alumno(row[0], nombre=row[1], roles=[Rol.by_nombre('alumno')])

                 except:
                     u = Alumno.byPadron(row[0])
                 try:
                 except:
                     u = Alumno.byPadron(row[0])
                 try: