[Mpuls-commits] r2896 - in jmd/trunk: . jmdweb/controllers

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-06-07 09:34:09 +0200 (Mon, 07 Jun 2010)
New Revision: 2896

Modified:
   jmd/trunk/ChangeLog
   jmd/trunk/jmd.json
   jmd/trunk/jmdweb/controllers/jmdstruktur.py
Log:
Merged


Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog	2010-06-04 14:28:34 UTC (rev 2895)
+++ jmd/trunk/ChangeLog	2010-06-07 07:34:09 UTC (rev 2896)
@@ -40,6 +40,8 @@
 2010-05-18  Torsten Irländer <torsten.irlaender at intevation.de>
 
 	* jmd.json: Apdated categories of logbook for JMD.
+	* jmdweb/controllers/jmdstruktur.py
+	(JmdstrukturController.permissionAction): Only show cm-user
 
 2010-05-11  Bernhard Herzog  <bh at intevation.de>
 

Modified: jmd/trunk/jmd.json
===================================================================
--- jmd/trunk/jmd.json	2010-06-04 14:28:34 UTC (rev 2895)
+++ jmd/trunk/jmd.json	2010-06-07 07:34:09 UTC (rev 2896)
@@ -11,7 +11,7 @@
 		"exportXLS": "1",
 		"exportCSV": "0",
 		"casebundle": "1",
-		"logbook": "1"
+		"logbook": "0"
 	},
 	"phases": {
 		"phases": ["0","1","2"],
@@ -67,7 +67,7 @@
 			},
 			{
 				"name": "Arbeit mit Dritten",
-			 	"items": ["12", "13", "14"]
+			 	"items": ["9", "10", "11", "12", "13", "14"]
 			},
 			{
 				"name": "Sonstiges",
@@ -90,9 +90,9 @@
     				"11": "Korrespondenz mit Jugendhilfe (Telefonat/Schriftverkehr)",
     				"12": "Gespräch mit beteiligten Dritten/Kooperationspartnern",
     				"13": "Korrespondenz mit beteiligten Dritten/Kooperationspartnern (Telefonat/Schriftverkehr)",
-    				"14": "Fallkonferenz",
+    				"14": "Förder bzw. Fallkonferenz",
     				"15": "Fahrtwege",
-    				"16": "Dokumentation i-mpuls JMD",
+    				"16": "Dokumentation WASKO",
     				"17": "Teambesprechung",
     				"-2": "sonstige Angaben",
     				"-1": "Keine Angabe"

Modified: jmd/trunk/jmdweb/controllers/jmdstruktur.py
===================================================================
--- jmd/trunk/jmdweb/controllers/jmdstruktur.py	2010-06-04 14:28:34 UTC (rev 2895)
+++ jmd/trunk/jmdweb/controllers/jmdstruktur.py	2010-06-07 07:34:09 UTC (rev 2896)
@@ -33,7 +33,7 @@
 
 import formencode
 
-from mpulsweb.model.user import UserListObject
+from mpulsweb.model.user import UserListObject, UserGroupList
 from mpulsweb.model.agencysettings import Agency
 from mpulsweb.lib.base import BaseController, c, render, request, h
 from mpulsweb.lib.security import checkRole