[Mpuls-commits] r2679 - in wasko/branches/2.0: . mpulsweb/controllers mpulsweb/templates/casemanagement

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-05-06 09:29:07 +0200 (Thu, 06 May 2010)
New Revision: 2679

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/mpulsweb/controllers/caseappointment.py
   wasko/branches/2.0/mpulsweb/templates/casemanagement/showAppointment.mako
Log:
Load cases into session when opening caseappointments

Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-05-05 16:21:25 UTC (rev 2678)
+++ wasko/branches/2.0/ChangeLog	2010-05-06 07:29:07 UTC (rev 2679)
@@ -1,3 +1,9 @@
+2010-05-06  Roland Geider <roland.geider at intevation.de>
+
+	* mpulsweb/controllers/caseappointment.py:
+	* mpulsweb/templates/casemanagement/showAppointment.mako: Load cases into
+        session when opening caseappointments.
+
 2010-05-05  Roland Geider <roland.geider at intevation.de>
 
 	* mpulsweb/i18n/mpulsweb.pot:

Modified: wasko/branches/2.0/mpulsweb/controllers/caseappointment.py
===================================================================
--- wasko/branches/2.0/mpulsweb/controllers/caseappointment.py	2010-05-05 16:21:25 UTC (rev 2678)
+++ wasko/branches/2.0/mpulsweb/controllers/caseappointment.py	2010-05-06 07:29:07 UTC (rev 2679)
@@ -114,6 +114,7 @@
         factory = CaseAppointmentFactory()
         id = self._checkInt(id)
         app = factory.loadById(id)
+        self._loadCase(app.case_id)
         c.appointment = app
         return render('/casemanagement/showAppointment.mako')
 

Modified: wasko/branches/2.0/mpulsweb/templates/casemanagement/showAppointment.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/casemanagement/showAppointment.mako	2010-05-05 16:21:25 UTC (rev 2678)
+++ wasko/branches/2.0/mpulsweb/templates/casemanagement/showAppointment.mako	2010-05-06 07:29:07 UTC (rev 2679)
@@ -1,7 +1,7 @@
 <%inherit file="/casemanagement/main.mako" />
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+  <li><a href="/case/select/${c.appointment.case_id}/1">${_('cm_np_select')}</a></li>
   <li><a href="/caseappointment/index/${c.appointment.case_id}">${_('app_np_list')}</a></li>
   <li><a href="/caseappointment/show/${c.appointment.id}">${_('app_np_show')}</a></li>
 </%def>