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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-08-27 21:05:20 +0200 (Fri, 27 Aug 2010)
New Revision: 3475

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/lib/search.py
Log:
* mpulsweb/lib/search.py (Search.VALID_OPTIONS)
(Search.MULTI_OPTIONS): The options listed here were actually
implemented only in CaseSearch.  So remove them from here.
(CaseSearch.VALID_OPTIONS, CaseSearch.MULTI_OPTIONS): Add the
options that were removed from the base class.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-08-27 19:02:50 UTC (rev 3474)
+++ base/trunk/ChangeLog	2010-08-27 19:05:20 UTC (rev 3475)
@@ -1,5 +1,13 @@
 2010-08-27  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/lib/search.py (Search.VALID_OPTIONS)
+	(Search.MULTI_OPTIONS): The options listed here were actually
+	implemented only in CaseSearch.  So remove them from here.
+	(CaseSearch.VALID_OPTIONS, CaseSearch.MULTI_OPTIONS): Add the
+	options that were removed from the base class.
+
+2010-08-27  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/lib/search.py (Search.MULTI_OPTIONS): New.  Lists all
 	search options that are actually lists and may be given multiple
 	times.

Modified: base/trunk/mpulsweb/lib/search.py
===================================================================
--- base/trunk/mpulsweb/lib/search.py	2010-08-27 19:02:50 UTC (rev 3474)
+++ base/trunk/mpulsweb/lib/search.py	2010-08-27 19:05:20 UTC (rev 3475)
@@ -20,8 +20,8 @@
 
 class Search(object):
 
-    VALID_OPTIONS = ('state', 'phase')
-    MULTI_OPTIONS = ('state', 'phase')
+    VALID_OPTIONS = ()
+    MULTI_OPTIONS = ()
 
     SEARCH_QUERY = """
     SELECT %(fields)s
@@ -97,8 +97,9 @@
 class CaseSearch(Search):
 
     VALID_OPTIONS = (Search.VALID_OPTIONS
-                     + ("own", "standin", "editor", "branch", "sdate", "edate",
-                        "sort_field", "sort_order"))
+                     + ("state", "phase", "own", "standin", "editor", "branch",
+                        "sdate", "edate", "sort_field", "sort_order"))
+    MULTI_OPTIONS = ('state', 'phase')
 
 
     def __init__(self, retrieve_fields, match_fields):