el update ahora setea el responsable

diff --git a/sercom/subcontrollers/grupo/__init__.py b/sercom/subcontrollers/grupo/__init__.py
index e7e1b309cac12a9ad9d197ea4757c1d2a64e4162..f919753e603883768a707b616c7c3e3da03e4993 100644 (file)
--- a/sercom/subcontrollers/grupo/__init__.py
+++ b/sercom/subcontrollers/grupo/__init__.py
@@ -108,7 +108,7 @@ class GrupoForm(W.TableForm):
         curso = W.SingleSelectField(name='cursoID', label=_(u'Curso'), options = get_cursos,
         validator = V.Int(not_empty=True))
         nombre = W.TextField(label=_(u'Nombre'), validator=V.UnicodeString(not_empty=True,strip=True))
-        responsable = CustomTextField(label=_(u'Responsable'), validator=V.Int(not_empty=True), attrs=dict(size='8'))
+        responsable = CustomTextField(label=_(u'Responsable'), validator=V.UnicodeString(not_empty=True), attrs=dict(size='8'))
 
     fields = Fields()
     javascript = [W.JSSource("MochiKit.DOM.focusOnLoad('curso');"), W.JSSource(ajax)]
@@ -169,7 +169,20 @@ class GrupoController(controllers.Controller, identity.SecureResource):
     @expose()
     def update(self, id, **kw):
         """Save or create record to model"""
+        responsable = kw['responsable']
+        curso = kw['cursoID']
+        alumno = None
+        try:
+            # Busco el alumno inscripto
+            alumno = AlumnoInscripto.select(AND(Curso.q.id==curso, Alumno.q.usuario==responsable))
+            if alumno.count() > 0:
+                alumno = alumno[0]
+        except Exception, (inst):
+            flash(_(u'El responsable %s no existe') % responsable)
+            raise redirect('../list')
+
         r = validate_set(id, kw)
+        r.responsable = alumno
         flash(_(u'El %s fue actualizado.') % name)
         raise redirect('../list')
 

diff --git a/sercom/subcontrollers/grupo/templates/edit.kid b/sercom/subcontrollers/grupo/templates/edit.kid
index 7b50a66d2f81063ea5d11985c21bd6717e1ec888..7973188d078b07fa286ce7830a24ca2b8fb4fa61 100644 (file)
--- a/sercom/subcontrollers/grupo/templates/edit.kid
+++ b/sercom/subcontrollers/grupo/templates/edit.kid
@@ -9,12 +9,11 @@
 
 <h1>Modificación de <span py:replace="name">Objeto</span></h1>
 
-<div py:replace="form(value=record, action=tg.url('/curso/update/%d' % record.id),
+<div py:replace="form(value=record, action=tg.url('/grupo/update/%d' % record.id),
        submit_text=_(u'Guardar'))">Formulario</div>
 
 <br/>
-<a href="${tg.url('/curso/show/%d' % record.id)}">Ver (cancela)</a> |
-<a href="${tg.url('/curso/list')}">Volver (cancela)</a>
+<a href="${tg.url('/grupo/list')}">Volver (cancela)</a>
 
 </body>
 </html>

diff --git a/sercom/subcontrollers/grupo/templates/list.kid b/sercom/subcontrollers/grupo/templates/list.kid
index 6d7d4af3fc1d9bf20aa4e276f653a7512bc536bd..c9e497941bc588fd6cf71873623de1948f105174 100644 (file)
--- a/sercom/subcontrollers/grupo/templates/list.kid
+++ b/sercom/subcontrollers/grupo/templates/list.kid
@@ -19,7 +19,7 @@
     <tr py:for="record in records">
         <td><span py:replace="record.curso.shortrepr()">curso</span></td>
         <td><span py:replace="record.nombre">nombre</span></td>
-        <td><span py:replace="record.responsable"></span></td>
+        <td><span py:if="record.responsable is not None" py:replace="record.responsable.alumno.shortrepr()"></span></td>
                                <td>
                                        <a href="${tg.url('/grupo/edit/%d' % record.id)}">Editar</a>
                                        <a href="${tg.url('/grupo/delete/%d' % record.id)}" onclick="if (confirm('${_(u'Estás seguro? Tal vez sólo quieras desactivarlo mejor...')}')) { var f = document.createElement('form'); this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href; f.submit(); };return false;">Eliminar</a>