[Mpuls-commits] r3503 - in jmd/trunk: . jmdweb/lib

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-08-31 21:05:04 +0200 (Tue, 31 Aug 2010)
New Revision: 3503

Modified:
   jmd/trunk/ChangeLog
   jmd/trunk/jmdweb/lib/search.py
Log:
* jmdweb/lib/search.py (CaseSearch.convert_form_parameters): Add
extended parameter.  Only handle "type_ending" search option if
it's an extended search.


Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog	2010-08-31 19:03:11 UTC (rev 3502)
+++ jmd/trunk/ChangeLog	2010-08-31 19:05:04 UTC (rev 3503)
@@ -1,5 +1,11 @@
 2010-08-31  Bernhard Herzog  <bh at intevation.de>
 
+	* jmdweb/lib/search.py (CaseSearch.convert_form_parameters): Add
+	extended parameter.  Only handle "type_ending" search option if
+	it's an extended search.
+
+2010-08-31  Bernhard Herzog  <bh at intevation.de>
+
 	* jmdstruktur.json, jmd.json: Change type of the default values
 	for the search options "phase", "state" and, for jmd.json,
 	"type_ending" to int to match the types the validator returns for

Modified: jmd/trunk/jmdweb/lib/search.py
===================================================================
--- jmd/trunk/jmdweb/lib/search.py	2010-08-31 19:03:11 UTC (rev 3502)
+++ jmd/trunk/jmdweb/lib/search.py	2010-08-31 19:05:04 UTC (rev 3503)
@@ -57,13 +57,14 @@
                                                        convert_to_list=True))
         return validator.to_python(params)
 
-    def convert_form_parameters(self, options, user):
-        search_options = CaseBaseSearch.convert_form_parameters(self, options,
-                                                                user)
-        if "type_ending" in options:
-            search_options["type_ending"] = options["type_ending"]
+    def convert_form_parameters(self, options, user, extended=True):
+        search = CaseBaseSearch.convert_form_parameters(self, options, user,
+                                                        extended=extended)
+        if extended:
+            if "type_ending" in options:
+                search["type_ending"] = options["type_ending"]
 
-        return search_options
+        return search
 
 
     def get_gender_clause(self, options):