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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-10-08 21:19:59 +0200 (Fri, 08 Oct 2010)
New Revision: 3947

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/controllers/evaluate.py
Log:
* 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/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-10-08 18:49:23 UTC (rev 3946)
+++ base/trunk/ChangeLog	2010-10-08 19:19:59 UTC (rev 3947)
@@ -1,6 +1,13 @@
 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.
+
+2010-10-08  Bernhard Herzog  <bh at intevation.de>
+
+	* mpulsweb/controllers/evaluate.py
 	(EvaluateController.evaluateAction): Refactor the code
 	substantially: Apply the same conn Parameter change to
 	EvaluationConfig instantiation as previously in the evaluate

Modified: base/trunk/mpulsweb/controllers/evaluate.py
===================================================================
--- base/trunk/mpulsweb/controllers/evaluate.py	2010-10-08 18:49:23 UTC (rev 3946)
+++ base/trunk/mpulsweb/controllers/evaluate.py	2010-10-08 19:19:59 UTC (rev 3947)
@@ -194,6 +194,7 @@
             log.exception("Error while decoding form parameters")
             form_result = error.value
             form_errors = error.error_dict or {}
+            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'),