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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-28 12:09:07 +0100 (Thu, 28 Jan 2010)
New Revision: 976

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/controllers/case.py
Log:
* waskaweb/controllers/case.py (CaseController.phase): Remove
references to session_case. It was only used to fetch the mode,
which isn't really used anymore and is currently always "show"


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-01-28 10:09:05 UTC (rev 975)
+++ wasko/branches/2.0/ChangeLog	2010-01-28 11:09:07 UTC (rev 976)
@@ -1,3 +1,9 @@
+2010-01-28  Bernhard Herzog  <bh at intevation.de>
+
+	* waskaweb/controllers/case.py (CaseController.phase): Remove
+	references to session_case. It was only used to fetch the mode,
+	which isn't really used anymore and is currently always "show"
+
 2010-01-28  Torsten Irländer <torsten.irlaender at intevation.de>
 
 	Deleted orphaned mako templates. All of them are not referenced in any

Modified: wasko/branches/2.0/waskaweb/controllers/case.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/case.py	2010-01-28 10:09:05 UTC (rev 975)
+++ wasko/branches/2.0/waskaweb/controllers/case.py	2010-01-28 11:09:07 UTC (rev 976)
@@ -787,12 +787,11 @@
         case = self._loadCase(id)
         phase = case.getState().getPhase()
 
-        session_case = session.get('case')
+        # FIXME: the links generated by link are very likely wrong.
+        # They should point to formularpage/select.
+        link = lambda ti, extra = "": '"/case/show/%d/%s%s"' % (id, ti.key,
+                                                                extra)
 
-        mode = session_case and session_case.getMode() or "show"
-        link = lambda ti, extra = "": '"/case/%s/%d/%s%s"' % (mode, id, ti.key,
-                                                              extra)
-
         rf = RequiredFields(g.formedTree)
 
         navigation = self.getNavigation()