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

[scm-commit@wald.intevation.org]

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

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/lib/search.py
Log:
* mpulsweb/lib/search.py (CaseSearch.convert_form_parameters):
Always include -1 in the state values.  This behavior was
accidentally removed in an earlier commit.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-08-31 13:33:01 UTC (rev 3495)
+++ base/trunk/ChangeLog	2010-08-31 18:05:21 UTC (rev 3496)
@@ -1,5 +1,11 @@
 2010-08-31  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/lib/search.py (CaseSearch.convert_form_parameters):
+	Always include -1 in the state values.  This behavior was
+	accidentally removed in an earlier commit.
+
+2010-08-31  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/templates/casemanagement/caselist.mako: Do not add
 	/case/select/ID links for cases that have been anonymized.
 

Modified: base/trunk/mpulsweb/lib/search.py
===================================================================
--- base/trunk/mpulsweb/lib/search.py	2010-08-31 13:33:01 UTC (rev 3495)
+++ base/trunk/mpulsweb/lib/search.py	2010-08-31 18:05:21 UTC (rev 3496)
@@ -199,8 +199,10 @@
             search_options["search_string"] = [options.get('search_str')]
 
         # Status
+        # we alwas match the state -1 for backwards compatibility
+        search_options["state"] = [-1]
         if "state" in options:
-            search_options["state"] = options["state"]
+            search_options["state"].extend(options["state"])
 
         # Responsibilty
         # shown cases where the user is editor, or standin or both