Pasar JS a widget de formulario.

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

diff --git a/sercom/subcontrollers/docente/__init__.py b/sercom/subcontrollers/docente/__init__.py
index c93184d44464e7ce9d8eb9591df8a92e6ae852f4..df4a2b78752d4d64bde944a696825dd23472ca47 100644 (file)
--- a/sercom/subcontrollers/docente/__init__.py
+++ b/sercom/subcontrollers/docente/__init__.py
@@ -1,13 +1,14 @@
 # vim: set et sw=4 sts=4 encoding=utf-8 :
 
+import cherrypy
 from turbogears import controllers, expose, redirect
 from turbogears import validate, validators, flash, error_handler
-from sercom.model import Docente
 from turbogears.widgets import *
 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 Docente
 
 cls = Docente
 name = 'docente'
@@ -42,6 +43,7 @@ form = TableForm(fields=[
         #help_text=_(u'Si no está activo no puede ingresar al sistema.'),
         validator=validators.Bool(if_empty=1)),
 ])
+form.javascript.append(JSSource("MochiKit.DOM.focusOnLoad('form_usuario');"))
 
 class DocenteController(controllers.Controller, identity.SecureResource):
     """Basic model admin interface"""
@@ -56,13 +58,12 @@ class DocenteController(controllers.Controller, identity.SecureResource):
     def index(self):
         raise redirect('list')
 
-    @expose(template='kid:sercom.subcontrollers.%s.templates.list' % name)
+    @expose(template='kid:%s.templates.list' % __name__)
     @paginate('records')
-    def list(self, **kw):
+    def list(self):
         """List records in model"""
-        f = kw.get('tg_flash', None)
         r = cls.select()
-        return dict(records=r, name=name, namepl=namepl, tg_flash=f)
+        return dict(records=r, name=name, namepl=namepl)
 
     @expose()
     def activate(self, id, activo):
@@ -70,15 +71,14 @@ class DocenteController(controllers.Controller, identity.SecureResource):
         r = validate_get(id)
         try:
             r.activo = bool(int(activo))
-        except ValueError, e:
-            raise redirect('../list', tg_flash=_(u'Acción inválida.'))
-        raise redirect('../list')
+        except ValueError:
+            raise cherrypy.NotFound
+        raise redirect('../../list')
 
-    @expose(template='kid:sercom.subcontrollers.%s.templates.new' % name)
+    @expose(template='kid:%s.templates.new' % __name__)
     def new(self, **kw):
         """Create new records in model"""
-        f = kw.get('tg_flash', None)
-        return dict(name=name, namepl=namepl, form=form, tg_flash=f, values=kw)
+        return dict(name=name, namepl=namepl, form=form, values=kw)
 
     @validate(form=form)
     @error_handler(new)
@@ -86,14 +86,14 @@ class DocenteController(controllers.Controller, identity.SecureResource):
     def create(self, **kw):
         """Save or create record to model"""
         validate_new(kw)
-        raise redirect('list', tg_flash=_(u'Se creó un nuevo %s.') % name)
+        flash(_(u'Se creó un nuevo %s.') % name)
+        raise redirect('list')
 
-    @expose(template='kid:sercom.subcontrollers.%s.templates.edit' % name)
+    @expose(template='kid:%s.templates.edit' % __name__)
     def edit(self, id, **kw):
         """Edit record in model"""
         r = validate_get(id)
-        return dict(name=name, namepl=namepl, record=r, form=form,
-            tg_flash=kw.get('tg_flash', None))
+        return dict(name=name, namepl=namepl, record=r, form=form)
 
     @validate(form=form)
     @error_handler(edit)
@@ -101,14 +101,17 @@ class DocenteController(controllers.Controller, identity.SecureResource):
     def update(self, id, **kw):
         """Save or create record to model"""
         r = validate_set(id, kw)
-        raise redirect('../list',
-            tg_flash=_(u'El %s fue actualizado.') % name)
+        flash(_(u'El %s fue actualizado.') % name)
+        raise redirect('../list')
 
-    @expose(template='kid:sercom.subcontrollers.%s.templates.show' % name)
+    @expose(template='kid:%s.templates.show' % __name__)
     def show(self,id, **kw):
         """Show record in model"""
         r = validate_get(id)
-        r.obs = publish_parts(r.observaciones, writer_name='html')['html_body']
+        if r.observaciones is None:
+            r.obs = ''
+        else:
+            r.obs = publish_parts(r.observaciones, writer_name='html')['html_body']
         return dict(name=name, namepl=namepl, record=r)
 
     @expose()
@@ -116,6 +119,6 @@ class DocenteController(controllers.Controller, identity.SecureResource):
         """Destroy record in model"""
         r = validate_get(id)
         r.destroySelf()
-        raise redirect('../list',
-            tg_flash=_(u'El %s fue eliminado permanentemente.') % name)
+        flash(_(u'El %s fue eliminado permanentemente.') % name)
+        raise redirect('../list')