[Mpuls-commits] r695 - in wasko/branches/1.0: . waskaweb/controllers

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-11-17 14:25:50 +0100 (Tue, 17 Nov 2009)
New Revision: 695

Modified:
   wasko/branches/1.0/ChangeLog.txt
   wasko/branches/1.0/waskaweb/controllers/case.py
Log:
Hotfix for disabling start of nb phase if end of cb is abort


Modified: wasko/branches/1.0/ChangeLog.txt
===================================================================
--- wasko/branches/1.0/ChangeLog.txt	2009-11-17 13:15:15 UTC (rev 694)
+++ wasko/branches/1.0/ChangeLog.txt	2009-11-17 13:25:50 UTC (rev 695)
@@ -3,7 +3,8 @@
 	Issue606
 
 	* templates/casemanagement/phase.mako: Allow to restarting allready
-	finished phases again.
+	finished phases again. Further added check if end of CM was abort. if
+	so, then nb phase can not be startet.
 
 2009-11-11 	Torsten Irlaender	<torsten.irlaender at intevation.de> 
 

Modified: wasko/branches/1.0/waskaweb/controllers/case.py
===================================================================
--- wasko/branches/1.0/waskaweb/controllers/case.py	2009-11-17 13:15:15 UTC (rev 694)
+++ wasko/branches/1.0/waskaweb/controllers/case.py	2009-11-17 13:25:50 UTC (rev 695)
@@ -820,7 +820,8 @@
 
         D = g.formedTree.getData
         nbtr = int(D('nbtr'))
-        c.nachbetreuung_geplant = nbtr not in [1,-1,-3]
+        abbr = int(D('cm_end_art'))
+        c.nachbetreuung_geplant = nbtr not in [1,-1,-3] and abbr != 3
 
         c.global_warnings = g.formedTree.linksToGlobalWarnings(id, navigation, link)
         c.form_navigation = self._getFormNavigation()