[Mpuls-commits] r2857 - base/trunk/mpulsweb/controllers

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-06-03 10:43:53 +0200 (Thu, 03 Jun 2010)
New Revision: 2857

Modified:
   base/trunk/mpulsweb/controllers/evaluate.py
Log:
* mpulsweb/controllers/evaluate.py
(EvaluateController.evaluateAction): Do not define start end end field
for dates in evaluation as they are already defined in the search
subquery.


Modified: base/trunk/mpulsweb/controllers/evaluate.py
===================================================================
--- base/trunk/mpulsweb/controllers/evaluate.py	2010-06-02 13:48:06 UTC (rev 2856)
+++ base/trunk/mpulsweb/controllers/evaluate.py	2010-06-03 08:43:53 UTC (rev 2857)
@@ -14,7 +14,7 @@
 
 from mpulsweb.lib.base import BaseController, render, request, response
 from mpulsweb.lib.db import db
-from mpulsweb.lib.helpers import format_date, get_phasesuccessors
+from mpulsweb.lib.helpers import format_date
 from mpulsweb.lib.validators import EvaluationFormValidator
 from mpulsweb.model.phase import PhaseFactory  
 
@@ -221,8 +221,8 @@
                 evalconfig = EvaluationConfig(get_configfile(form_result['id']),
                                               conn, eval_params['start_date'],
                                               eval_params['end_date'],
-                                              eval_params['start_date_field'],
-                                              eval_params['end_date_field'],
+                                              None, 
+                                              None, 
                                               None,
                                               eval_params['sql'],
                                               eval_params['typelist'])