Cambiar forma de obtener listados parciales.

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

diff --git a/sercom/subcontrollers/docente/__init__.py b/sercom/subcontrollers/docente/__init__.py
index c93184d44464e7ce9d8eb9591df8a92e6ae852f4..4759fa66a252bd8dd62641abecc86a0cbe4a2f27 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 :
 
 # 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 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 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'
 
 cls = Docente
 name = 'docente'


@@ -56,7 +57,7 @@ class DocenteController(controllers.Controller, identity.SecureResource):
     def index(self):
         raise redirect('list')
 
     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):
         """List records in model"""
     @paginate('records')
     def list(self, **kw):
         """List records in model"""


@@ -70,11 +71,11 @@ class DocenteController(controllers.Controller, identity.SecureResource):
         r = validate_get(id)
         try:
             r.activo = bool(int(activo))
         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)
     def new(self, **kw):
         """Create new records in model"""
         f = kw.get('tg_flash', None)


@@ -88,7 +89,7 @@ class DocenteController(controllers.Controller, identity.SecureResource):
         validate_new(kw)
         raise redirect('list', tg_flash=_(u'Se creó un nuevo %s.') % name)
 
         validate_new(kw)
         raise redirect('list', tg_flash=_(u'Se creó un nuevo %s.') % name)
 

-    @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)
     def edit(self, id, **kw):
         """Edit record in model"""
         r = validate_get(id)


@@ -104,11 +105,14 @@ class DocenteController(controllers.Controller, identity.SecureResource):
         raise redirect('../list',
             tg_flash=_(u'El %s fue actualizado.') % name)
 
         raise redirect('../list',
             tg_flash=_(u'El %s fue actualizado.') % name)
 

-    @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)
     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()
         return dict(name=name, namepl=namepl, record=r)
 
     @expose()