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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-10-08 21:34:09 +0200 (Fri, 08 Oct 2010)
New Revision: 3949

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/controllers/evaluate.py
Log:
* mpulsweb/controllers/evaluate.py (EvaluateController.evaluate):
evaloptions is only used within the evaluate method so there's no
need to put it into the c-Object


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-10-08 19:22:23 UTC (rev 3948)
+++ base/trunk/ChangeLog	2010-10-08 19:34:09 UTC (rev 3949)
@@ -1,5 +1,11 @@
 2010-10-08  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/controllers/evaluate.py (EvaluateController.evaluate):
+	evaloptions is only used within the evaluate method so there's no
+	need to put it into the c-Object
+
+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

Modified: base/trunk/mpulsweb/controllers/evaluate.py
===================================================================
--- base/trunk/mpulsweb/controllers/evaluate.py	2010-10-08 19:22:23 UTC (rev 3948)
+++ base/trunk/mpulsweb/controllers/evaluate.py	2010-10-08 19:34:09 UTC (rev 3949)
@@ -101,15 +101,14 @@
     def evaluate(self, id=None):
         c.evalconfig = EvaluationConfig(get_configfile(id), None, None, None,
                                         None, None, None, None, None)
-        c.evaloptions = get_search_options(session.get('evaluation.options'),
-                                           id,
-                                           session.get("evaluation_ids", ()))
+        evaloptions = get_search_options(session.get('evaluation.options'), id,
+                                         session.get("evaluation_ids", ()))
 
         # If user selects adele-evaluation render page with disabled
         # configuration elements.  Change default params
         if id == '0':
-            c.evaloptions['phase'] = g.mpuls_config.get('evaluations',
-                                                        'adele-phases')
+            evaloptions['phase'] = g.mpuls_config.get('evaluations',
+                                                      'adele-phases')
             c.adele_evaluation = True
         else:
             c.adele_evaluation = False
@@ -117,7 +116,7 @@
 
         c.phases = PhaseFactory().build() 
         form = render('/evaluation/evaluate.mako')
-        return formencode.htmlfill.render(form, defaults=c.evaloptions,
+        return formencode.htmlfill.render(form, defaults=evaloptions,
                                           errors={}, auto_insert_errors=False)
 
     def _get_evalparams(self, form_result):