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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-05-26 17:18:08 +0200 (Wed, 26 May 2010)
New Revision: 2771

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


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-05-26 14:48:45 UTC (rev 2770)
+++ base/trunk/ChangeLog	2010-05-26 15:18:08 UTC (rev 2771)
@@ -1,5 +1,11 @@
 2010-05-26  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/controllers/document.py
+	(DocumentController.globalDelete): Use h.url_for consistently for
+	all-intra application URLs.
+
+2010-05-26  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/templates/casemanagement/caselist.mako: Pass the
 	confirmed flag to url_for with the correct name.
 

Modified: base/trunk/mpulsweb/controllers/document.py
===================================================================
--- base/trunk/mpulsweb/controllers/document.py	2010-05-26 14:48:45 UTC (rev 2770)
+++ base/trunk/mpulsweb/controllers/document.py	2010-05-26 15:18:08 UTC (rev 2771)
@@ -141,8 +141,10 @@
             c.context = "../main.mako"
             c.dialog_title = SET_DOCUMENT_CONFIRM_DELETE_HEADER
             c.dialog_text = SET_DOCUMENT_CONFIRM_DELETE_TEXT
-            c.url_yes = "/document/globalDelete/%d/1" % id
-            c.url_no = "/document/globalOverview/"
+            c.url_yes = h.url_for(controller='/document',
+                                  action='globalDelete', id=id, confirmed=1)
+            c.url_no = h.url_for(controller='/document',
+                                 action='globalOverview')
             return render('/documents/dialogs/confirm.mako')
 
 # vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8: