[Mpuls-commits] r3812 - in waska/trunk: . waskaweb/lib

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-09-28 19:04:12 +0200 (Tue, 28 Sep 2010)
New Revision: 3812

Modified:
   waska/trunk/ChangeLog
   waska/trunk/waskaweb/lib/search.py
Log:
* waskaweb/lib/search.py (CaseSearch.convert_form_parameters): Do
not copy the type_ending search options if it's empty so that the
search will not select based on type of ending at all.
Implements the WASKA part of mpuls/issue1047


Modified: waska/trunk/ChangeLog
===================================================================
--- waska/trunk/ChangeLog	2010-09-28 17:01:59 UTC (rev 3811)
+++ waska/trunk/ChangeLog	2010-09-28 17:04:12 UTC (rev 3812)
@@ -1,3 +1,10 @@
+2010-09-28  Bernhard Herzog  <bh at intevation.de>
+
+	* waskaweb/lib/search.py (CaseSearch.convert_form_parameters): Do
+	not copy the type_ending search options if it's empty so that the
+	search will not select based on type of ending at all.
+	Implements the WASKA part of mpuls/issue1047
+
 2010-09-27  Torsten Irländer <torsten.irlaender at intevation.de>
 
 	* waskaweb/public/formed/formedtree.xml: Issue1010

Modified: waska/trunk/waskaweb/lib/search.py
===================================================================
--- waska/trunk/waskaweb/lib/search.py	2010-09-28 17:01:59 UTC (rev 3811)
+++ waska/trunk/waskaweb/lib/search.py	2010-09-28 17:04:12 UTC (rev 3812)
@@ -61,8 +61,9 @@
         search = CaseBaseSearch.convert_form_parameters(self, options, user,
                                                         extended=extended)
         if extended:
-            if "type_ending" in options:
-                search["type_ending"] = options["type_ending"]
+            type_ending = options.get("type_ending")
+            if type_ending:
+                search["type_ending"] = list(type_ending)
 
         return search