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

[scm-commit at wald.intevation.org]

Author: torsten
Date: 2012-11-29 16:52:07 +0100 (Thu, 29 Nov 2012)
New Revision: 6141

Modified:
   waska/trunk/waskaweb/controllers/evaluate.py
Log:
Removed base



Modified: waska/trunk/waskaweb/controllers/evaluate.py
===================================================================
--- waska/trunk/waskaweb/controllers/evaluate.py	2012-11-12 12:33:31 UTC (rev 6140)
+++ waska/trunk/waskaweb/controllers/evaluate.py	2012-11-29 15:52:07 UTC (rev 6141)
@@ -1,7 +1,8 @@
 from pylons import session
 from mpulsweb.controllers.evaluate import \
      EvaluateController as MpulsEvaluateController, \
-     get_common_options, get_default_adele_options, get_session_options
+     get_common_options, get_default_adele_options, get_session_options, \
+     get_default_options
 
 class EvaluateController(MpulsEvaluateController):
 
@@ -16,6 +17,16 @@
         else:
             return "TRUE"
 
+    def get_default_adele_options():
+        """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
+        'evaluations', 'adele-phases' configuration option.
+        """
+        options = get_default_options()
+        options["phase"] = g.mpuls_config.get('evaluations', 'adele-phases')
+        return options
+
     def _get_options(self, id, evalconfig):
         # If user selects adele-evaluation render page with different default
         # options and no session options.