[Mpuls-commits] r1655 - in wasko/branches/2.0: . waskaweb/controllers

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-02-18 11:21:37 +0100 (Thu, 18 Feb 2010)
New Revision: 1655

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/controllers/caseappointment.py
Log:
* waskaweb/controllers/caseappointment.py
(CaseappointmentController.show): Set a default value for
confirmed parameter to make this controller action work again.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-02-18 10:06:56 UTC (rev 1654)
+++ wasko/branches/2.0/ChangeLog	2010-02-18 10:21:37 UTC (rev 1655)
@@ -1,5 +1,11 @@
 2010-02-18  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/controllers/caseappointment.py
+	(CaseappointmentController.show): Set a default value for
+	confirmed parameter to make this controller action work again.
+
+2010-02-18  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/templates/casemanagement/showAppointment.mako: Fix
 	navigation link.
 

Modified: wasko/branches/2.0/waskaweb/controllers/caseappointment.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/caseappointment.py	2010-02-18 10:06:56 UTC (rev 1654)
+++ wasko/branches/2.0/waskaweb/controllers/caseappointment.py	2010-02-18 10:21:37 UTC (rev 1655)
@@ -113,7 +113,14 @@
 
     @checkRole(('admin_ka', 'cm_ka'))
     @checkPrivacyStatement('showAppointment')
-    def show(self, id, confirmed):
+    def show(self, id, confirmed=True):
+        # This method has a "confirmed" parameter because of
+        # checkPrivacyStatement which requires it.  The default value of
+        # confirmed is True because usually this controller is used when
+        # the privacy statement nag-screen has already been shown.
+        # Also, it was the default value used in the original routing in
+        # waskaweb/config/routing.py.
+        # FIXME: do we really need the checkPrivacyStatement decorator here?
         factory = CaseAppointmentFactory()
         id = self._checkInt(id)
         app = factory.loadById(id)