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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-05-26 18:46:01 +0200 (Wed, 26 May 2010)
New Revision: 2777

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/controllers/repeatgroup.py
Log:
* mpulsweb/controllers/repeatgroup.py
(RepeatgroupController.delete): Use h.url_for consistently for
all-intra application URLs.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-05-26 16:42:41 UTC (rev 2776)
+++ base/trunk/ChangeLog	2010-05-26 16:46:01 UTC (rev 2777)
@@ -1,5 +1,11 @@
 2010-05-26  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/controllers/repeatgroup.py
+	(RepeatgroupController.delete): Use h.url_for consistently for
+	all-intra application URLs.
+
+2010-05-26  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/controllers/privacy.py (PrivacyController.decline): Use
 	h.url_for consistently for all-intra application URLs.
 

Modified: base/trunk/mpulsweb/controllers/repeatgroup.py
===================================================================
--- base/trunk/mpulsweb/controllers/repeatgroup.py	2010-05-26 16:42:41 UTC (rev 2776)
+++ base/trunk/mpulsweb/controllers/repeatgroup.py	2010-05-26 16:46:01 UTC (rev 2777)
@@ -64,8 +64,10 @@
         else:
             c.confirm_for = DELETE_RG_ENTRY_CONFIRM
             c.question = DELETE_RG_ENTRY_CONFIRM_TEXT
-            c.url_yes = "/repeatgroup/delete/%s/1" % id
-            c.url_no = "/formularpage/select/%s" % session['case'].getPageId()
+            c.url_yes = h.url_for(controller='/repeatgroup', action='delete',
+                                  id=id, confirmed=1)
+            c.url_no = h.url_for(controller='/formularpage', action='select',
+                                 id=session['case'].getPageId())
             return render('/repeatgroup/dialogs/confirm_delete_rg_entry.mako')
 
     def new(self, id):