[Mpuls-commits] r3112 - in base/trunk: . mpulsweb/controllers

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-07-02 12:19:47 +0200 (Fri, 02 Jul 2010)
New Revision: 3112

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/controllers/formularpage.py
Log:
* mpulsweb/controllers/formularpage.py
(FormularpageController.save): Make sure not use routes memory
when generating the redirection URLs for the deletion/addition of
repeat groups.  For the delete URLs the confirmed flag would
already be set on the URL after the first deletion so that
subsequent deletions would not ask for confirmation anymore.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-07-02 10:14:23 UTC (rev 3111)
+++ base/trunk/ChangeLog	2010-07-02 10:19:47 UTC (rev 3112)
@@ -1,6 +1,15 @@
 2010-07-02  Bernhard Herzog  <bh at intevation.de>
 
 	* mpulsweb/controllers/formularpage.py
+	(FormularpageController.save): Make sure not use routes memory
+	when generating the redirection URLs for the deletion/addition of
+	repeat groups.  For the delete URLs the confirmed flag would
+	already be set on the URL after the first deletion so that
+	subsequent deletions would not ask for confirmation anymore.
+
+2010-07-02  Bernhard Herzog  <bh at intevation.de>
+
+	* mpulsweb/controllers/formularpage.py
 	(FormularpageController.save): Use redirect_to instead of redirect
 	with an explicit url_for call.  The former combines redirect and
 	url_for.

Modified: base/trunk/mpulsweb/controllers/formularpage.py
===================================================================
--- base/trunk/mpulsweb/controllers/formularpage.py	2010-07-02 10:14:23 UTC (rev 3111)
+++ base/trunk/mpulsweb/controllers/formularpage.py	2010-07-02 10:19:47 UTC (rev 3112)
@@ -202,10 +202,10 @@
             session.save()
             # How to proceed after saving the data?
             if request.params.has_key('add_rg'):
-                redirect_to(controller='repeatgroup', action="new",
+                redirect_to(controller='/repeatgroup', action="new",
                             id=request.params.get('add_rg'))
             elif request.params.has_key('del_rg'):
-                redirect_to(controller='repeatgroup', action="delete",
+                redirect_to(controller='/repeatgroup', action="delete",
                             id=request.params.get('del_rg'))
             elif request.params.has_key('savenext'):
                 page_id = session['navigation.tree'].getTreeItem(page_id).nextKey().key