[Mpuls-commits] r1696 - wasko/branches/2.0/jmdweb/controllers

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-23 15:45:49 +0100 (Tue, 23 Feb 2010)
New Revision: 1696

Modified:
   wasko/branches/2.0/jmdweb/controllers/case.py
Log:
* jmdweb/controllers/case.py: Commented out method for organisaion (defined in mpulsweb)


Modified: wasko/branches/2.0/jmdweb/controllers/case.py
===================================================================
--- wasko/branches/2.0/jmdweb/controllers/case.py	2010-02-23 14:42:11 UTC (rev 1695)
+++ wasko/branches/2.0/jmdweb/controllers/case.py	2010-02-23 14:45:49 UTC (rev 1696)
@@ -256,14 +256,17 @@
 
     @checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
     def digest(self, id):
+        log.debug('1')
         id = self._checkInt(id)
         case = self.init_case(id)
+        log.debug('2')
         c.case = case
         c.last_access = case.getState().getAccessTime()
         c.daysToMaxSavetime = case.getState().daysToMaxSavetime()
         c.maxsavetime = case.getState().getMaxSavetime()
         c.finished = case.getState().isCmFinished()
         c.canceled = case.getState().isCmCanceled()
+        log.debug('3')
         return render('/casemanagement/digest.mako')
 
     @checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
@@ -323,12 +326,14 @@
         elif request.params.has_key('save'):
             validator = NewCaseForm()
             try:
+                log.debug('x')
                 form_result = validator.to_python(request.params)
                 # 1. Create a new case
                 case = g.case_factory.createNew(data=convert2dic(form_result))
                 statement = case.getPrivacyStatement()
 
                 # 2. Do we want to sign the statement?
+                log.debug('y')
                 if form_result.get('statement_signed'):
                     statement.sign()
 
@@ -337,6 +342,7 @@
                 c.form_result = error.value
                 c.form_errors = error.error_dict or {}
                 return render('/casemanagement/new.mako')
+        log.debug('z')
 
         return self.select(str(case.id))
 
@@ -381,30 +387,30 @@
     def createExportScheme(self):
         return render('casemanagement/create_export_scheme.mako')
 
-    @checkRole(('admin_ka', 'cm_ka'))
-    def organisation(self, id):
-        id = self._checkInt(id)
-        ulist = UserListObject()
-        list = UserGroupList()
-        c.case = self._loadCase(id)
-        c.standin = c.case.getStandin()
-        c.editor = c.case.getEditor()
-        c.current_user = session['USER_AUTHORIZED']
+    ##@checkRole(('admin_ka', 'cm_ka'))
+    ##def organisation(self, id):
+    ##    id = self._checkInt(id)
+    ##    ulist = UserListObject()
+    ##    list = UserGroupList()
+    ##    c.case = self._loadCase(id)
+    ##    c.standin = c.case.getStandin()
+    ##    c.editor = c.case.getEditor()
+    ##    c.current_user = session['USER_AUTHORIZED']
 
-        # group list for standin
-        filter = [u.gid for u in ulist.getAdminList()]
-        filter.append(c.editor.gid)
-        filter2 = filter[:]
-        filter.append(c.current_user.gid)
-        c.group_list = list.getGroupList(filter)
-        c.group_list2 = list.getGroupList(filter2)
+    ##    # group list for standin
+    ##    filter = [u.gid for u in ulist.getAdminList()]
+    ##    filter.append(c.editor.gid)
+    ##    filter2 = filter[:]
+    ##    filter.append(c.current_user.gid)
+    ##    c.group_list = list.getGroupList(filter)
+    ##    c.group_list2 = list.getGroupList(filter2)
 
-        # userlist for editor
-        filter3 = [u.id for u in ulist.getAdminList()]
-        filter3.append(c.current_user.id)
-        filter3.append(c.editor.id)
-        c.user_list = ulist.getUserList(filter3)
-        return render('/casemanagement/organisation.mako')
+    ##    # userlist for editor
+    ##    filter3 = [u.id for u in ulist.getAdminList()]
+    ##    filter3.append(c.current_user.id)
+    ##    filter3.append(c.editor.id)
+    ##    c.user_list = ulist.getUserList(filter3)
+    ##    return render('/casemanagement/organisation.mako')
 
 
     @checkRole('admin_ka')