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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-05-26 16:37:45 +0200 (Wed, 26 May 2010)
New Revision: 2768

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


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-05-26 14:34:02 UTC (rev 2767)
+++ base/trunk/ChangeLog	2010-05-26 14:37:45 UTC (rev 2768)
@@ -1,5 +1,11 @@
 2010-05-26  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/controllers/casedocument.py
+	(CasedocumentController.delete): Use h.url_for consistently for
+	all-intra application URLs.
+
+2010-05-26  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/controllers/case_bundle.py
 	(CaseBundleController._empty_caselist)
 	(CaseBundleController.no_action)

Modified: base/trunk/mpulsweb/controllers/casedocument.py
===================================================================
--- base/trunk/mpulsweb/controllers/casedocument.py	2010-05-26 14:34:02 UTC (rev 2767)
+++ base/trunk/mpulsweb/controllers/casedocument.py	2010-05-26 14:37:45 UTC (rev 2768)
@@ -111,7 +111,8 @@
             c.context = "../main.mako"
             c.confirm_for = SET_ATTACHMENT_CONFIRM_DELETE_HEADER
             c.question = SET_ATTACHMENT_CONFIRM_DELETE_TEXT
-            c.url_yes = "/casedocument/delete/%d/1" % (id)
+            c.url_yes = h.url_for(controller='/casedocument', action='delete',
+                                  id=id, confirmed=1)
             c.url_no = h.url_for(controller="/casedocument", action="index",
                                  id=session['case'].id)
             return render('/casemanagement/dialogs/'