[Mpuls-commits] r1798 - wasko/branches/2.0/mpulsweb/controllers

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-25 15:45:06 +0100 (Thu, 25 Feb 2010)
New Revision: 1798

Modified:
   wasko/branches/2.0/mpulsweb/controllers/case.py
Log:
Adapted rolenames (cm_ka -> cm) and (admin_ka -> ka)


Modified: wasko/branches/2.0/mpulsweb/controllers/case.py
===================================================================
--- wasko/branches/2.0/mpulsweb/controllers/case.py	2010-02-25 14:41:16 UTC (rev 1797)
+++ wasko/branches/2.0/mpulsweb/controllers/case.py	2010-02-25 14:45:06 UTC (rev 1798)
@@ -49,11 +49,11 @@
         session.save()
         return case
 
-    @checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
+    @checkRole(('admin', 'cm', 'pt_dlr'))
     def index(self):
         redirect_to(controller="/case_overview")
 
-    @checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
+    @checkRole(('admin', 'cm', 'pt_dlr'))
     def digest(self, id):
         id = self._checkInt(id)
         case = self.init_case(id)
@@ -68,7 +68,7 @@
     #
     # Anonymize
     #
-    @checkRole('cm_ka')
+    @checkRole('cm')
     def markForAnonymize(self, id, confirmed):
         id = self._checkInt(id)
         confirmed = self._checkBool(confirmed)
@@ -104,7 +104,7 @@
             c.url_no = "/case/digest/%s" % id
             return render('/casemanagement/dialogs/confirm_markanonymize.mako')
 
-    ##@checkRole('admin_ka')
+    ##@checkRole('admin')
     ##def anonymize(self, id, confirmed):
     ##    id = self._checkInt(id)
     ##    confirmed = self._checkBool(confirmed)
@@ -144,12 +144,12 @@
     #
     # Printing
     #
-    @checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
+    @checkRole(('admin', 'cm', 'pt_dlr'))
     def printdigest(self, id):
         c.print_version = 1
         return self.digest(id)
 
-    @checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
+    @checkRole(('admin', 'cm', 'pt_dlr'))
     def printAll(self, id, empty='0'):
         c.print_version = 1
         out = []
@@ -173,7 +173,7 @@
     # Create new case
     # 
 
-    @checkRole('cm_ka')
+    @checkRole('cm')
     def new2(self):
         c.case = session.get('case')
         return render('/casemanagement/new.mako')
@@ -182,7 +182,7 @@
     # ORGANISATION (standin and editor settings)
     #
 
-    @checkRole(('admin_ka', 'cm_ka'))
+    @checkRole(('admin', 'cm'))
     def organisation(self, id):
         id = self._checkInt(id)
         ulist = UserListObject()
@@ -207,7 +207,7 @@
         c.user_list = ulist.getUserList(filter3)
         return render('/casemanagement/organisation.mako')
 
-    @checkRole('admin_ka')
+    @checkRole('admin')
     def setEditorAction(self):
         validator = SetEditorForm()
         try:
@@ -222,7 +222,7 @@
             c.status_msg = h.status_message("Fehler! Bearbeiter nicht gesetzt.")
             return render('/casemanagement/organisation.mako')
 
-    @checkRole(('admin_ka', 'cm_ka'))
+    @checkRole(('admin', 'cm'))
     def setStandinAction(self):
         validator = SetStandinForm()
         data = formencode.variabledecode.variable_decode(request.params)