[Mpuls-commits] r694 - in wasko/branches/1.0: . waskaweb/templates/casemanagement

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-11-17 14:15:15 +0100 (Tue, 17 Nov 2009)
New Revision: 694

Modified:
   wasko/branches/1.0/ChangeLog.txt
   wasko/branches/1.0/waskaweb/templates/casemanagement/phase.mako
Log:
Issue606


Modified: wasko/branches/1.0/ChangeLog.txt
===================================================================
--- wasko/branches/1.0/ChangeLog.txt	2009-11-16 14:34:40 UTC (rev 693)
+++ wasko/branches/1.0/ChangeLog.txt	2009-11-17 13:15:15 UTC (rev 694)
@@ -1,3 +1,10 @@
+2009-11-17 	Torsten Irlaender	<torsten.irlaender at intevation.de> 
+
+	Issue606
+
+	* templates/casemanagement/phase.mako: Allow to restarting allready
+	finished phases again.
+
 2009-11-11 	Torsten Irlaender	<torsten.irlaender at intevation.de> 
 
 	Issue522

Modified: wasko/branches/1.0/waskaweb/templates/casemanagement/phase.mako
===================================================================
--- wasko/branches/1.0/waskaweb/templates/casemanagement/phase.mako	2009-11-16 14:34:40 UTC (rev 693)
+++ wasko/branches/1.0/waskaweb/templates/casemanagement/phase.mako	2009-11-17 13:15:15 UTC (rev 694)
@@ -52,7 +52,7 @@
         % if is_allowed:
             % if (p1.isRecursiveComplete() and not p1.isRunning() and (p1.isNeighbor(c.current_phase) or c.current_phase.hasPredecessor(p1))):
               % if c.current_phase.phase == 3:
-                % if c.nachbetreuung_geplant:
+                % if c.nachbetreuung_geplant or p1.phase <= 3:
                   <input type="submit" value="Start" name="${p1.getLabel()|h}">
                 % else:
                   <input type="submit" value="Start" name="${p1.getLabel()|h}" disabled="disabled">