From b095cc64b996bdb63bbddd051887a6180770c684 Mon Sep 17 00:00:00 2001
From: Leandro Lucarella <llucax@gmail.com>
Date: Fri, 16 Feb 2007 00:09:23 +0000
Subject: [PATCH 1/1] Reportar error de URL como 404 en vez de un redirect.

---
 sercom/subcontrollers/docente/__init__.py        |  7 ++++---
 sercom/subcontrollers/docente/templates/list.kid |  2 +-
 sercom/subcontrollers/validate.py                | 12 ++++--------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/sercom/subcontrollers/docente/__init__.py b/sercom/subcontrollers/docente/__init__.py
index d7d58bc..4759fa6 100644
--- 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 :
 
+import cherrypy
 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))
-        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):
diff --git a/sercom/subcontrollers/docente/templates/list.kid b/sercom/subcontrollers/docente/templates/list.kid
index 2ffe51c..0bcec6b 100644
--- 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);
-            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>
diff --git a/sercom/subcontrollers/validate.py b/sercom/subcontrollers/validate.py
index 67b749a..1495a9a 100644
--- 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
+from cherrypy import NotFound
 
 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)
-- 
2.43.0