solo muestro archivos con extension diff.

[software/sercom.git] / sercom / subcontrollers / alumno / __init__.py

diff --git a/sercom/subcontrollers/alumno/__init__.py b/sercom/subcontrollers/alumno/__init__.py
index 3d2c11a1e3280c38f1f07525b79ca8b65ec6e114..7dd7f015d9e553c79914f7385507aa26077ddaad 100644 (file)
--- a/sercom/subcontrollers/alumno/__init__.py
+++ b/sercom/subcontrollers/alumno/__init__.py
@@ -10,7 +10,7 @@ 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 Alumno
+from sercom.model import Alumno, Rol

 from sqlobject import *
 #}}}
 
 from sqlobject import *
 #}}}
 


@@ -107,6 +107,7 @@ class AlumnoController(controllers.Controller, identity.SecureResource):
     @expose()
     def create(self, **kw):
         """Save or create record to model"""
     @expose()
     def create(self, **kw):
         """Save or create record to model"""

+        kw['roles'] = [Rol.by_nombre('alumno')]

         validate_new(kw)
         flash(_(u'Se creó un nuevo %s.') % name)
         raise redirect('list')
         validate_new(kw)
         flash(_(u'Se creó un nuevo %s.') % name)
         raise redirect('list')


@@ -157,16 +158,18 @@ class AlumnoController(controllers.Controller, identity.SecureResource):
         lines = archivo.file.read().split('\n')
         ok = []
         fail = []
         lines = archivo.file.read().split('\n')
         ok = []
         fail = []

+        entregador = Rol.get(2)

         for line in lines:
             for row in csv.reader([line]):
                 if row == []:
                     continue
                 try:
         for line in lines:
             for row in csv.reader([line]):
                 if row == []:
                     continue
                 try:

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

                     u.email = row[2]
                     u.telefono = row[3]
                     u.email = row[2]
                     u.telefono = row[3]

-                    u.contrasenia = row[0]
+                    u.password = row[0]

                     u.activo = True
                     u.activo = True

+                    u.add_rol(entregador)

                     ok.append(row)
                 except Exception, e:
                     row.append(str(e))
                     ok.append(row)
                 except Exception, e:
                     row.append(str(e))


@@ -182,7 +185,7 @@ class AlumnoController(controllers.Controller, identity.SecureResource):
             alumno = Alumno.byPadron(padron=padron)
             msg = {}
             msg['id'] = alumno.id
             alumno = Alumno.byPadron(padron=padron)
             msg = {}
             msg['id'] = alumno.id

-            msg['value'] = alumno.nombre
+            msg['value'] = alumno.shortrepr()

         except SQLObjectNotFound:
             msg = 'No existe el alumno con padron: %s.' % padron
             error=True
         except SQLObjectNotFound:
             msg = 'No existe el alumno con padron: %s.' % padron
             error=True