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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-10-07 15:24:31 +0200 (Thu, 07 Oct 2010)
New Revision: 3918

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/controllers/evaluate.py
Log:
* mpulsweb/controllers/evaluate.py (get_search_options)
(EvaluateController.evaluateAction): Remove commented out code.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-10-07 09:06:38 UTC (rev 3917)
+++ base/trunk/ChangeLog	2010-10-07 13:24:31 UTC (rev 3918)
@@ -1,3 +1,8 @@
+2010-10-07  Bernhard Herzog  <bh at intevation.de>
+
+	* mpulsweb/controllers/evaluate.py (get_search_options)
+	(EvaluateController.evaluateAction): Remove commented out code.
+
 2010-10-07  Torsten Irlaender <torsten at intevation.de>
 
 	* mpulsweb/public/images/icons/info/ok_22.png: New icon for

Modified: base/trunk/mpulsweb/controllers/evaluate.py
===================================================================
--- base/trunk/mpulsweb/controllers/evaluate.py	2010-10-07 09:06:38 UTC (rev 3917)
+++ base/trunk/mpulsweb/controllers/evaluate.py	2010-10-07 13:24:31 UTC (rev 3918)
@@ -91,12 +91,6 @@
     options["selected_ids"] = " ".join(map(unicode, selected_ids))
     options['typelist'] = c.evalconfig.get_evaluations()
 
-    #phases = []
-    #for p in g.mpuls_config.get('search', 'phases'):
-    #    pt = [t for t in p.values() if int(t) >= 0]
-    #    phases.extend(pt)
-    #options['phase'] = phases
-
     # convert dates to locale
     options['start_date'] = format_date(options['start_date'])
     options['end_date'] = format_date(options['end_date'])
@@ -208,7 +202,6 @@
         '''Return an HTML file containing the result of one or more evaluations.
         '''
         params = formencode.variabledecode.variable_decode(request.params)
-        #params = request.params
         validator = EvaluationFormValidator()
         form_result = {}
         form_errors = {}