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

[scm-commit@wald.intevation.org]

Author: roland
Date: 2011-06-08 16:11:50 +0200 (Wed, 08 Jun 2011)
New Revision: 5085

Modified:
   jmd/trunk/ChangeLog
   jmd/trunk/jmd.json
   jmd/trunk/jmdweb/lib/search.py
Log:
issue2059: add gender to search options

Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog	2011-06-08 12:39:59 UTC (rev 5084)
+++ jmd/trunk/ChangeLog	2011-06-08 14:11:50 UTC (rev 5085)
@@ -1,5 +1,10 @@
 2011-06-08 Roland Geider  <roland.geider at intevation.de>
 
+	* jmd.json,
+	  jmdweb/lib/search.py: issue2059: add gender to search options
+
+2011-06-08 Roland Geider  <roland.geider at intevation.de>
+
 	* jmdstrukturweb/public/formed/annotations.xhtml: issue2185: added
 	  help texts
 

Modified: jmd/trunk/jmd.json
===================================================================
--- jmd/trunk/jmd.json	2011-06-08 12:39:59 UTC (rev 5084)
+++ jmd/trunk/jmd.json	2011-06-08 14:11:50 UTC (rev 5085)
@@ -57,7 +57,8 @@
 			 "editor": -1,
 			 "state": [3, 4], 
 			 "phase": [-1, 0, 1, 2],
-			 "type_ending": [-3, -1, 0, 1]
+			 "type_ending": [-3, -1, 0, 1],
+			 "gender": [-2, -1, 0, 1]
 			}
 		],
 		"cm_defaults": [
@@ -66,7 +67,8 @@
 			 "search_str": "", 
 			 "state": [1], 
 			 "phase": [-1, 0, 1, 2],
-			 "type_ending": [-3, -1, 0, 1]
+			 "type_ending": [-3, -1, 0, 1],
+			 "gender": [-2, -1, 0, 1]
 			}
 		]
 	},

Modified: jmd/trunk/jmdweb/lib/search.py
===================================================================
--- jmd/trunk/jmdweb/lib/search.py	2011-06-08 12:39:59 UTC (rev 5084)
+++ jmd/trunk/jmdweb/lib/search.py	2011-06-08 14:11:50 UTC (rev 5085)
@@ -40,7 +40,10 @@
 log = logging.getLogger(__name__)
 
 class AppMixin(AppBaseMixin):
+    pass
 
+
+class CaseSearch(CaseBaseSearch, AppMixin):
     VALID_OPTIONS = (CaseBaseSearch.VALID_OPTIONS
                      + ("gender", "type_ending"))
     MULTI_OPTIONS = (CaseBaseSearch.MULTI_OPTIONS
@@ -91,11 +94,6 @@
             self.get_ending_clause(options),
             ]
 
-
-class CaseSearch(CaseBaseSearch, AppMixin):
-
-    pass
-
 class EvaluationSearch(EvaluationBaseSearch, AppMixin):
 
     pass