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

[scm-commit at wald.intevation.org]

Author: torsten
Date: 2012-11-29 18:21:44 +0100 (Thu, 29 Nov 2012)
New Revision: 6142

Modified:
   waska/trunk/waskaweb/controllers/evaluate.py
Log:
Do not import adele specific code from base as it has been removed. Overwrite
controller to implement adele stuff only in WASKA


Modified: waska/trunk/waskaweb/controllers/evaluate.py
===================================================================
--- waska/trunk/waskaweb/controllers/evaluate.py	2012-11-29 15:52:07 UTC (rev 6141)
+++ waska/trunk/waskaweb/controllers/evaluate.py	2012-11-29 17:21:44 UTC (rev 6142)
@@ -1,7 +1,7 @@
-from pylons import session
+from pylons import session, g
 from mpulsweb.controllers.evaluate import \
      EvaluateController as MpulsEvaluateController, \
-     get_common_options, get_default_adele_options, get_session_options, \
+     get_common_options, get_session_options, \
      get_default_options
 
 class EvaluateController(MpulsEvaluateController):
@@ -17,7 +17,7 @@
         else:
             return "TRUE"
 
-    def get_default_adele_options():
+    def get_default_adele_options(self):
         """Return a dictionary with the default evaluation options for 'adele'.
         It has the same contents as the one returned by
         get_default_options() except for the phase which is taken from the
@@ -33,7 +33,7 @@
         common_options = get_common_options(evalconfig, id,
                                             session.get("evaluation_ids", ()))
         if id == "0":
-            option_sources = [common_options, get_default_adele_options()]
+            option_sources = [common_options, self.get_default_adele_options()]
         else:
             option_sources  = [get_default_options(), common_options,
                                get_session_options()]