[Mpuls-commits] r988 - wasko/branches/2.0/waskaweb/controllers

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-01-28 17:18:31 +0100 (Thu, 28 Jan 2010)
New Revision: 988

Modified:
   wasko/branches/2.0/waskaweb/controllers/caselifetime.py
Log:
 * waskaweb/controllers/caselifetime.py
(CaselifetimeController.changeLifetime): Did removed unused code.

* waskaweb/controllers/caselifetime.py
(CaselifetimeController.abortAction): Removed unused code and call
self.index now after case was aborted 

* waskaweb/controllers/caselifetime.py
(CaselifetimeController.abortcase): Removed unused code


Modified: wasko/branches/2.0/waskaweb/controllers/caselifetime.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/caselifetime.py	2010-01-28 16:14:11 UTC (rev 987)
+++ wasko/branches/2.0/waskaweb/controllers/caselifetime.py	2010-01-28 16:18:31 UTC (rev 988)
@@ -338,10 +338,6 @@
         return render('/caselifetime/overview.mako')
 
     def changeLifetime(self):
-        checkcase()
-        form_result = {}
-        form_errors = {}
-
         if request.params.has_key('wiederaufnahme'):
             return self.reopenAction()
         elif request.params.has_key('verlaengerung'):
@@ -355,7 +351,6 @@
         return render('/caselifetime/overview.mako')
 
     def abortcase(self, id, confirmed='0'):
-        checkcase()
         if confirmed == '1':
             # mark case for deletion
             factory = CaseFactory()
@@ -373,13 +368,8 @@
             return render('caselifetime/dialogs/confirm_reopen.mako')
 
     def abortAction(self):
-        checkcase()
-        form_result = {}
-        form_errors = {}
         return self.abortcase(0)
-        c.form_errors = form_errors
-        c.form_result = form_result
-        return render('/caselifetime/overview.mako')
+        return self.index(session['case'].id)
 
     def extraTimeAction(self):
         checkcase()