[Mpuls-commits] r6162 - waska/trunk/waskaweb/controllers

[scm-commit at wald.intevation.org]

Author: torsten
Date: 2013-01-03 11:20:39 +0100 (Thu, 03 Jan 2013)
New Revision: 6162

Modified:
   waska/trunk/waskaweb/controllers/evaluate.py
Log:
Issue3538: Import correct session


Modified: waska/trunk/waskaweb/controllers/evaluate.py
===================================================================
--- waska/trunk/waskaweb/controllers/evaluate.py	2012-12-19 11:23:02 UTC (rev 6161)
+++ waska/trunk/waskaweb/controllers/evaluate.py	2013-01-03 10:20:39 UTC (rev 6162)
@@ -1,4 +1,5 @@
-from pylons import session, g
+from pylons import g
+from mpulsweb.lib.base import session
 from mpulsweb.controllers.evaluate import \
      EvaluateController as MpulsEvaluateController, \
      get_common_options, get_session_options, \
@@ -27,7 +28,7 @@
         options["phase"] = g.mpuls_config.get('evaluations', 'adele-phases')
         return options
 
-    def _get_options(self, id, evalconfig, session):
+    def _get_options(self, id, evalconfig):
         # If user selects adele-evaluation render page with different default
         # options and no session options.
         common_options = get_common_options(evalconfig, id,