Reportar error de URL como 404 en vez de un redirect.

[z.facultad/75.52/sercom.git] / sercom / subcontrollers / docente / __init__.py

diff --git a/sercom/subcontrollers/docente/__init__.py b/sercom/subcontrollers/docente/__init__.py
index a167d7a61445f88ae312cc888f3be87cef1a770f..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 :
 
+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'
@@ -70,9 +71,9 @@ 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:%s.templates.new' % __name__)
     def new(self, **kw):
@@ -108,7 +109,10 @@ class DocenteController(controllers.Controller, identity.SecureResource):
     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()