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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-05-26 16:25:40 +0200 (Wed, 26 May 2010)
New Revision: 2766

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


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-05-26 14:01:03 UTC (rev 2765)
+++ base/trunk/ChangeLog	2010-05-26 14:25:40 UTC (rev 2766)
@@ -1,5 +1,11 @@
 2010-05-26  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/controllers/caseappointment.py
+	(CaseappointmentController.delete): Use h.url_for consistently for
+	all-intra application URLs.
+
+2010-05-26  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/controllers/appointment.py
 	(AppointmentController.createAction)
 	(AppointmentController.editAction)

Modified: base/trunk/mpulsweb/controllers/caseappointment.py
===================================================================
--- base/trunk/mpulsweb/controllers/caseappointment.py	2010-05-26 14:01:03 UTC (rev 2765)
+++ base/trunk/mpulsweb/controllers/caseappointment.py	2010-05-26 14:25:40 UTC (rev 2766)
@@ -182,15 +182,18 @@
             appointment.delete()
             c.success_for = DELETE_APPOINT_NOTIFICATION_SUCCESS
             c.success_text = DELETE_APPOINT_NOTIFICATION_TEXT_SUCCESS
-            c.url_ok = "/caseappointment/index/%s" % appointment.case_id
+            c.url_ok = url_for(controller='/caseappointment', action='index',
+                               id=appointment.case_id)
             return render('/casemanagement/dialogs/'
                           'success_delete_appointment.mako')
         else:
             c.context = "../main.mako"
             c.confirm_for = DELETE_APPOINT_CONFIRM
             c.question = DELETE_APPOINT_CONFIRM_TEXT
-            c.url_yes = "/caseappointment/delete/%s/1" % id
-            c.url_no = "/caseappointment/index/%s" % appointment.case_id
+            c.url_yes = url_for(controller='/caseappointment', action='delete',
+                                id=id, confirmed=1)
+            c.url_no = url_for(controller='/caseappointment', action='index',
+                               id=appointment.case_id)
             return render('/casemanagement/dialogs/'
                           'confirm_delete_appointment.mako')