[Mpuls-commits] r3489 - in base/trunk: . mpulsweb/lib

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-08-30 19:47:55 +0200 (Mon, 30 Aug 2010)
New Revision: 3489

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/lib/validators.py
Log:
* mpulsweb/lib/validators.py (SearchCaseForm.state)
(SearchCaseForm.phase): Make state and phase lists of integers.
That way we don't have to convert them anymore when using dicts to
pass the options to the search classes.  This should have been
part of the previous commit.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-08-30 17:37:38 UTC (rev 3488)
+++ base/trunk/ChangeLog	2010-08-30 17:47:55 UTC (rev 3489)
@@ -1,5 +1,13 @@
 2010-08-30  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/lib/validators.py (SearchCaseForm.state)
+	(SearchCaseForm.phase): Make state and phase lists of integers.
+	That way we don't have to convert them anymore when using dicts to
+	pass the options to the search classes.  This should have been
+	part of the previous commit.
+
+2010-08-30  Bernhard Herzog  <bh at intevation.de>
+
 	Make it possible to pass search parameters as a dict, too
 
 	* mpulsweb/lib/search.py (Search.check_list)

Modified: base/trunk/mpulsweb/lib/validators.py
===================================================================
--- base/trunk/mpulsweb/lib/validators.py	2010-08-30 17:37:38 UTC (rev 3488)
+++ base/trunk/mpulsweb/lib/validators.py	2010-08-30 17:47:55 UTC (rev 3489)
@@ -657,11 +657,11 @@
 
 class SearchCaseForm(BaseFormValidator):
 
-    state = ForEach(String(), convert_to_list=True)
+    state = ForEach(Int(), convert_to_list=True)
     own = Int(if_missing=0)
     standin = Int(if_missing=0)
     editor = Int(if_missing=-1)
-    phase = ForEach(String(), convert_to_list=True)
+    phase = ForEach(Int(), convert_to_list=True)
     sdate = DateCheck()
     edate = DateCheck()
     gender = Int(if_missing=-2)