# HG changeset patch
# User sylvain.thenault@logilab.fr
# Date 1242636716 -7200
# Node ID 01d7e413a5385c8c34ea517d3aa6b8bf32d2dbbe
# Parent  1ec251feb7c3153e715b27448684f6b551d5cd41# Parent  93840d187f2664dfbb0b68671aae9e33f463f93d
merge

diff -r 1ec251feb7c3 -r 01d7e413a538 .hgtags
--- a/.hgtags	Mon May 18 10:50:52 2009 +0200
+++ b/.hgtags	Mon May 18 10:51:56 2009 +0200
@@ -26,3 +26,5 @@
 9e98dec0768b87363a7826a04636dc161ed0ec7d cubicweb-debian-version-3_1_3-1
 e0e0a1c3d80f4fbf4bbd55066278e467b75df8a4 cubicweb-version-3_1_4
 0e132fbae9cc5e004f4b79a8b842addad43519a7 cubicweb-debian-version-3_1_4-1
+c14231e3a4f9120e2bb6a1d8690252fff5e48131 cubicweb-version-3_2_0
+c9c492787a8aa1b7916e22eb6498cba1c8fa316c cubicweb-debian-version-3_2_0-1
diff -r 1ec251feb7c3 -r 01d7e413a538 web/views/basecontrollers.py
--- a/web/views/basecontrollers.py	Mon May 18 10:50:52 2009 +0200
+++ b/web/views/basecontrollers.py	Mon May 18 10:51:56 2009 +0200
@@ -114,6 +114,8 @@
             try:
                 method = getattr(entity, req.form.pop('__method'))
                 method()
+            except Redirect: # propagate redirect that might occur in method()
+                raise
             except Exception, ex:
                 self.exception('while handling __method')
                 req.set_message(req._("error while handling __method: %s") % req._(ex))