[Mpuls-commits] r3813 - in wasko/trunk: . waskoweb/lib
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Sep 28 19:06:16 CEST 2010
Author: bh
Date: 2010-09-28 19:06:15 +0200 (Tue, 28 Sep 2010)
New Revision: 3813
Modified:
wasko/trunk/ChangeLog
wasko/trunk/waskoweb/lib/search.py
Log:
* waskoweb/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: wasko/trunk/ChangeLog
===================================================================
--- wasko/trunk/ChangeLog 2010-09-28 17:04:12 UTC (rev 3812)
+++ wasko/trunk/ChangeLog 2010-09-28 17:06:15 UTC (rev 3813)
@@ -1,3 +1,10 @@
+2010-09-28 Bernhard Herzog <bh at intevation.de>
+
+ * waskoweb/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-28 Torsten Irländer <torsten.irlaender at intevation.de>
* waskoweb/templates/casemanagement/new.mako: Issue1222: Fixed link
Modified: wasko/trunk/waskoweb/lib/search.py
===================================================================
--- wasko/trunk/waskoweb/lib/search.py 2010-09-28 17:04:12 UTC (rev 3812)
+++ wasko/trunk/waskoweb/lib/search.py 2010-09-28 17:06:15 UTC (rev 3813)
@@ -65,8 +65,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)
if "migration" in options:
search["migration"] = options["migration"]
More information about the Mpuls-commits
mailing list