[Mpuls-commits] r3948 - in base/trunk: . mpulsweb/controllers

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-10-08 21:22:23 +0200 (Fri, 08 Oct 2010)
New Revision: 3948

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/controllers/evaluate.py
Log:
* mpulsweb/controllers/evaluate.py
(EvaluateController.evaluateAction): c.evaloptions is not needed
when rerendering the evaluate.mako because of invalid form
parameters, so do not even compute its value.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-10-08 19:19:59 UTC (rev 3947)
+++ base/trunk/ChangeLog	2010-10-08 19:22:23 UTC (rev 3948)
@@ -1,6 +1,13 @@
 2010-10-08  Bernhard Herzog  <bh at intevation.de>
 
 	* mpulsweb/controllers/evaluate.py
+	(EvaluateController.evaluateAction): c.evaloptions is not needed
+	when rerendering the evaluate.mako because of invalid form
+	parameters, so do not even compute its value.
+
+2010-10-08  Bernhard Herzog  <bh at intevation.de>
+
+	* mpulsweb/controllers/evaluate.py
 	(EvaluateController.evaluateAction): Make the phases to the
 	evaluate.mako template if the form parameters are invalid so that
 	the phases are rendered properly.

Modified: base/trunk/mpulsweb/controllers/evaluate.py
===================================================================
--- base/trunk/mpulsweb/controllers/evaluate.py	2010-10-08 19:19:59 UTC (rev 3947)
+++ base/trunk/mpulsweb/controllers/evaluate.py	2010-10-08 19:22:23 UTC (rev 3948)
@@ -197,10 +197,6 @@
             c.phases = PhaseFactory().build()
             c.evalconfig = EvaluationConfig(config_file, None, None, None,
                                             None, None, None, None, None)
-            c.evaloptions = get_search_options(session.get('evaluation.options'),
-                                               id,
-                                               session.get("evaluation_ids",
-                                                           ()))
             form = render('/evaluation/evaluate.mako')
             return formencode.htmlfill.render(form, defaults=form_result,
                                               errors=form_errors,