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

diff --git a/sercom/subcontrollers/docente/__init__.py b/sercom/subcontrollers/docente/__init__.py
index d7d58bc87fff3792b835f45e3c09f7826f1b70a6..4759fa66a252bd8dd62641abecc86a0cbe4a2f27 100644 (file)
--- a/sercom/subcontrollers/docente/__init__.py
+++ b/sercom/subcontrollers/docente/__init__.py
@@ -1,5 +1,6 @@
 # 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.widgets import *
 from turbogears import controllers, expose, redirect
 from turbogears import validate, validators, flash, error_handler
 from turbogears.widgets import *


@@ -70,9 +71,9 @@ 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:%s.templates.new' % __name__)
     def new(self, **kw):
 
     @expose(template='kid:%s.templates.new' % __name__)
     def new(self, **kw):

diff --git a/sercom/subcontrollers/docente/templates/list.kid b/sercom/subcontrollers/docente/templates/list.kid
index 2ffe51c29a1427384a3844c7865616e3115e309e..0bcec6b7b13ec90f901d4e8600ba3ac0da074620 100644 (file)
--- a/sercom/subcontrollers/docente/templates/list.kid
+++ b/sercom/subcontrollers/docente/templates/list.kid
@@ -24,7 +24,7 @@
     <tr py:for="record in records">
         <td><input type="checkbox" onclick="var f =
             document.createElement('form'); this.parentNode.appendChild(f);
     <tr py:for="record in records">
         <td><input type="checkbox" onclick="var f =
             document.createElement('form'); this.parentNode.appendChild(f);

-            f.method = 'POST'; f.action = '${tg.url('/docente/activate/%d' % record.id, activo=str(int(not record.activo)))}';
+            f.method = 'POST'; f.action = '${tg.url('/docente/activate/%d/%d' % (record.id, int(not record.activo)))}';

             f.submit(); return false;" py:attrs="checked=tg.checker(record.activo)" /></td>
         <td><a href="${tg.url('/docente/show/%d' % record.id)}"><span py:replace="record.usuario">usuario</span></a></td>
         <td><span py:replace="record.nombre">nombre</span></td>
             f.submit(); return false;" py:attrs="checked=tg.checker(record.activo)" /></td>
         <td><a href="${tg.url('/docente/show/%d' % record.id)}"><span py:replace="record.usuario">usuario</span></a></td>
         <td><span py:replace="record.nombre">nombre</span></td>

diff --git a/sercom/subcontrollers/validate.py b/sercom/subcontrollers/validate.py
index 67b749a9edb983e52f2bfdf5ab41df52e6336a17..1495a9a3cde58b8469dd0c5eaf61e93a3e582031 100644 (file)
--- a/sercom/subcontrollers/validate.py
+++ b/sercom/subcontrollers/validate.py
@@ -3,17 +3,13 @@
 __all__ = ('validate_get', 'validate_set', 'validate_new')
 
 from turbogears import redirect
 __all__ = ('validate_get', 'validate_set', 'validate_new')
 
 from turbogears import redirect

+from cherrypy import NotFound

 
 def validate_get(cls, name, id, url='../list'):
     try:
 
 def validate_get(cls, name, id, url='../list'):
     try:

-        id = int(id)
-    except ValueError:
-        raise redirect(url, tg_flash=_(u'Identificador inválido: %s.') % id)
-    try:
-        return cls.get(id)
-    except LookupError:
-        raise redirect(url, tg_flash=_(u'No existe %s con identificador %d')
-            % (name, id))
+        return cls.get(int(id))
+    except (ValueError, LookupError):
+        raise NotFound

 
 def validate_set(cls, name, id, data, url='../edit'):
     r = validate_get(cls, name, id)
 
 def validate_set(cls, name, id, data, url='../edit'):
     r = validate_get(cls, name, id)