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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-08-30 13:03:48 +0200 (Mon, 30 Aug 2010)
New Revision: 3478

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/lib/search.py
Log:
* mpulsweb/lib/search.py (CaseSearch.MULTI_OPTIONS): Make sure to
use the inherited MULTI_OPTIONS value as well.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-08-30 10:17:04 UTC (rev 3477)
+++ base/trunk/ChangeLog	2010-08-30 11:03:48 UTC (rev 3478)
@@ -1,5 +1,10 @@
 2010-08-30  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/lib/search.py (CaseSearch.MULTI_OPTIONS): Make sure to
+	use the inherited MULTI_OPTIONS value as well.
+
+2010-08-30  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/lib/search.py (CaseSearch.get_phases_clause): It's not
 	guaranteed anymore that the options dictionary will have a "phase"
 	key.  Handle that case as if the value were an empty list.

Modified: base/trunk/mpulsweb/lib/search.py
===================================================================
--- base/trunk/mpulsweb/lib/search.py	2010-08-30 10:17:04 UTC (rev 3477)
+++ base/trunk/mpulsweb/lib/search.py	2010-08-30 11:03:48 UTC (rev 3478)
@@ -99,7 +99,7 @@
     VALID_OPTIONS = (Search.VALID_OPTIONS
                      + ("state", "phase", "own", "standin", "editor", "branch",
                         "sdate", "edate", "sort_field", "sort_order"))
-    MULTI_OPTIONS = ('state', 'phase')
+    MULTI_OPTIONS = Search.MULTI_OPTIONS + ('state', 'phase')
 
 
     def __init__(self, retrieve_fields, match_fields):