[Mpuls-commits] r3491 - jmd/trunk

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-08-31 12:20:47 +0200 (Tue, 31 Aug 2010)
New Revision: 3491

Modified:
   jmd/trunk/ChangeLog
   jmd/trunk/jmd.json
   jmd/trunk/jmdstruktur.json
Log:
* 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
the form parameters.


Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog	2010-08-30 18:12:39 UTC (rev 3490)
+++ jmd/trunk/ChangeLog	2010-08-31 10:20:47 UTC (rev 3491)
@@ -1,3 +1,10 @@
+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
+	the form parameters.
+
 2010-08-30  Bernhard Herzog  <bh at intevation.de>
 
 	* jmdweb/templates/casemanagement/search_extra.mako: New.  Search

Modified: jmd/trunk/jmd.json
===================================================================
--- jmd/trunk/jmd.json	2010-08-30 18:12:39 UTC (rev 3490)
+++ jmd/trunk/jmd.json	2010-08-31 10:20:47 UTC (rev 3491)
@@ -48,17 +48,17 @@
 		"default-sorting": "name", 
 		"admin_defaults": [
             		{"search_str": "", 
-			 "state": ["3", "4"], 
-			 "phase": ["-1", "0", "1", "2"],
-			 "type_ending": ["-3", "-1", "0", "1"]
+			 "state": [3, 4], 
+			 "phase": [-1, 0, 1, 2],
+			 "type_ending": [-3, -1, 0, 1]
 			}
 		],
 		"cm_defaults": [
             		{"own": "1", 
 			 "search_str": "", 
-			 "state": ["1"], 
-			 "phase": ["-1", "0", "1", "2"],
-			 "type_ending": ["-3", "-1", "0", "1"]
+			 "state": [1], 
+			 "phase": [-1, 0, 1, 2],
+			 "type_ending": [-3, -1, 0, 1]
 			}
 		]
 	},

Modified: jmd/trunk/jmdstruktur.json
===================================================================
--- jmd/trunk/jmdstruktur.json	2010-08-30 18:12:39 UTC (rev 3490)
+++ jmd/trunk/jmdstruktur.json	2010-08-31 10:20:47 UTC (rev 3491)
@@ -56,15 +56,15 @@
 	"search": {
 		"admin_defaults": [
             		{"search_str": "", 
-			 "state": ["3", "4"], 
-			 "phase": ["-1", "0"]}
+			 "state": [3, 4], 
+			 "phase": [-1, 0]}
 		],
 		"cm_defaults": [
             		{"own": "1",
 			 "standin": "1",
 			 "search_str": "", 
-			 "state": ["1"], 
-			 "phase": ["-1", "0"]}
+			 "state": [1], 
+			 "phase": [-1, 0]}
 		]
 	},
 	"logbook": {