[Mpuls-commits] r4856 - wasko/trunk

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2011-04-04 17:30:27 +0200 (Mon, 04 Apr 2011)
New Revision: 4856

Modified:
   wasko/trunk/ChangeLog
   wasko/trunk/wasko.json
Log:
Issue1973: Added option "editor" for cm and admin defaults


Modified: wasko/trunk/ChangeLog
===================================================================
--- wasko/trunk/ChangeLog	2011-04-04 10:46:51 UTC (rev 4855)
+++ wasko/trunk/ChangeLog	2011-04-04 15:30:27 UTC (rev 4856)
@@ -1,3 +1,8 @@
+2011-04-04  Torsten Irlaender <torsten at intevation.de>
+
+	* wasko.json: Issue1973: Added option "editor" for cm and admin
+	defaults
+
 2011-04-01  Ludwig Reiter <ludwig.reiter at intevation.de>
 
 	* waskoweb/i18n/waskoweb.pot
@@ -178,6 +183,7 @@
 	* waskoweb/templates/casemanagement/new.mako: Remove unused hidden
 	input element "page".
 
+>>>>>>> .r4855
 2011-02-01  Torsten Irlaender <torsten at intevation.de>
 
 	* wasko.json: Issue1744: Adapted dates to a new evaluation period

Modified: wasko/trunk/wasko.json
===================================================================
--- wasko/trunk/wasko.json	2011-04-04 10:46:51 UTC (rev 4855)
+++ wasko/trunk/wasko.json	2011-04-04 15:30:27 UTC (rev 4856)
@@ -66,12 +66,14 @@
 		"admin_defaults": [
             		{"search_str": "", 
 			 "state": [3, 4], 
+			 "editor": -1,
 			 "phase": [-1, 0, 1, 2, 3],
 			 "type_ending": [-3, -1, 1, 2, 3]}
 		],
 		"cm_defaults": [
             		{"own": "1", 
 			 "search_str": "", 
+			 "editor": -1,
 			 "state": [1], 
 			 "phase": [-1, 0, 1, 2, 3],
 			 "type_ending": [-3, -1, 1, 2, 3]}