[Mpuls-commits] r3814 - in jmd/trunk: . jmdweb/lib
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Sep 28 19:08:18 CEST 2010
Author: bh
Date: 2010-09-28 19:08:17 +0200 (Tue, 28 Sep 2010)
New Revision: 3814
Modified:
jmd/trunk/ChangeLog
jmd/trunk/jmdweb/lib/search.py
Log:
* jmdweb/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 JMD part of mpuls/issue1047
Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog 2010-09-28 17:06:15 UTC (rev 3813)
+++ jmd/trunk/ChangeLog 2010-09-28 17:08:17 UTC (rev 3814)
@@ -1,3 +1,10 @@
+2010-09-28 Bernhard Herzog <bh at intevation.de>
+
+ * jmdweb/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 JMD part of mpuls/issue1047
+
2010-09-17 Torsten Irländer <torsten.irlaender at intevation.de>
* jmd.json: Changed to automatic change of phases.
Modified: jmd/trunk/jmdweb/lib/search.py
===================================================================
--- jmd/trunk/jmdweb/lib/search.py 2010-09-28 17:06:15 UTC (rev 3813)
+++ jmd/trunk/jmdweb/lib/search.py 2010-09-28 17:08:17 UTC (rev 3814)
@@ -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
More information about the Mpuls-commits
mailing list