Limpiar y simplificar GrupoController.

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

diff --git a/sercom/subcontrollers/alumno/__init__.py b/sercom/subcontrollers/alumno/__init__.py
index 3d2c11a1e3280c38f1f07525b79ca8b65ec6e114..2eb418ff48e030729b77f967b284aa3064ffb093 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 sercom.model import Alumno
+from sercom.model import Alumno, Rol
 from sqlobject import *
 #}}}
 
@@ -157,6 +157,7 @@ class AlumnoController(controllers.Controller, identity.SecureResource):
         lines = archivo.file.read().split('\n')
         ok = []
         fail = []
+        entregador = Rol.get(2)
         for line in lines:
             for row in csv.reader([line]):
                 if row == []:
@@ -165,8 +166,9 @@ class AlumnoController(controllers.Controller, identity.SecureResource):
                     u = Alumno(row[0], nombre=row[1])
                     u.email = row[2]
                     u.telefono = row[3]
-                    u.contrasenia = row[0]
+                    u.password = row[0]
                     u.activo = True
+                    u.add_rol(entregador)
                     ok.append(row)
                 except Exception, e:
                     row.append(str(e))
@@ -182,7 +184,7 @@ class AlumnoController(controllers.Controller, identity.SecureResource):
             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