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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-10-07 17:49:44 +0200 (Thu, 07 Oct 2010)
New Revision: 3923

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/controllers/evaluate.py
Log:
* mpulsweb/controllers/evaluate.py (get_search_options): Remove
handling of unused option 'sqlwhere'.  This is the only place in
mpuls (base, waska, wasko, jmd) where it's used.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-10-07 14:45:37 UTC (rev 3922)
+++ base/trunk/ChangeLog	2010-10-07 15:49:44 UTC (rev 3923)
@@ -1,5 +1,11 @@
 2010-10-07  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/controllers/evaluate.py (get_search_options): Remove
+	handling of unused option 'sqlwhere'.  This is the only place in
+	mpuls (base, waska, wasko, jmd) where it's used.
+
+2010-10-07  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/controllers/evaluate.py
 	(EvaluateController._do_export): Rename the variable form_result
 	to params to reduce confusion.  form_result is usually used for

Modified: base/trunk/mpulsweb/controllers/evaluate.py
===================================================================
--- base/trunk/mpulsweb/controllers/evaluate.py	2010-10-07 14:45:37 UTC (rev 3922)
+++ base/trunk/mpulsweb/controllers/evaluate.py	2010-10-07 15:49:44 UTC (rev 3923)
@@ -79,7 +79,6 @@
             options['start_date_field'] = get_phase_dates(min(phase))[0]
             options['end_date_field'] = get_phase_dates(max(phase))[1]
         options['phase'] = max(phase) #TODO: Why max?
-        options['sqlwhere'] = soptions.get('sqlwhere') or None
         options['sql'] = soptions.get('sql') or None
     else:
         # set default evaluation options.