backporting
authorAnthony Truchet <anthony.truchet@logilab.fr>
Wed, 22 Feb 2012 11:57:42 +0100
changeset 8574 268bc595271b
parent 8253 df7d6c57a6c8 (current diff)
parent 8254 eff5b930998d (diff)
child 8576 c9c72ac10db3
backporting
web/controller.py
--- a/.hgignore	Wed Feb 22 09:31:54 2012 +0100
+++ b/.hgignore	Wed Feb 22 11:57:42 2012 +0100
@@ -14,6 +14,7 @@
 .*/data/database/.*\.sqlite
 .*/data/database/.*\.config
 .*/data/database/tmpdb.*
+.*/data/ldapdb/.*
 ^doc/html/
 ^doc/doctrees/
 ^doc/book/en/devweb/js_api/
--- a/web/controller.py	Wed Feb 22 09:31:54 2012 +0100
+++ b/web/controller.py	Wed Feb 22 11:57:42 2012 +0100
@@ -207,10 +207,12 @@
         if '__redirectpath' in self._cw.form:
             # if redirect path was explicitly specified in the form, use it
             path = self._cw.form['__redirectpath']
-            url = self._cw.build_url(path, **newparams)
+            url = self._cw.build_url(path)
             url = append_url_params(url, self._cw.form.get('__redirectparams'))
         else:
             url = self._cw.last_visited_page()
+        # The newparams must update the params in all cases
+        url = self._cw.rebuild_url(url, **newparams)
         raise Redirect(url)