[Mpuls-commits] r205 - in waska/trunk: . waskaweb/templates/casemanagement

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2008-10-20 17:51:32 +0200 (Mon, 20 Oct 2008)
New Revision: 205

Modified:
   waska/trunk/ChangeLog.txt
   waska/trunk/waskaweb/templates/casemanagement/phase.mako
Log:
Fixed issue562


Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt	2008-10-10 14:23:55 UTC (rev 204)
+++ waska/trunk/ChangeLog.txt	2008-10-20 15:51:32 UTC (rev 205)
@@ -1,3 +1,9 @@
+2008-10-20	Torsten Irlaender  <torsten.irlaender at intevation.de>
+
+	Fixed issue562
+
+	* templates/casemanagement/phase.mako: Gray out active phase 
+
 2008-10-10	Sascha L. Teichmann <sascha.teichmann at intevation.de>
 
 	Fixed issue184

Modified: waska/trunk/waskaweb/templates/casemanagement/phase.mako
===================================================================
--- waska/trunk/waskaweb/templates/casemanagement/phase.mako	2008-10-10 14:23:55 UTC (rev 204)
+++ waska/trunk/waskaweb/templates/casemanagement/phase.mako	2008-10-20 15:51:32 UTC (rev 205)
@@ -66,7 +66,7 @@
       <td class="table_row_h">${h.dd_mm_YYYY(p2.getTime(), '-/-')}</td>
       <td style="text-align:right" class="table_row_h">
         % if is_allowed:
-            % if (p2.isRecursiveComplete() and p2.isNeighbor(c.current_phase) and not c.current_phase.hasPredecessor(p2)) or not session.get('case').isYoungerThan('2008-09-01'):
+            % if (p2.isRecursiveComplete() and not p2.isRunning() and p2.isNeighbor(c.current_phase) and not c.current_phase.hasPredecessor(p2)) or not session.get('case').isYoungerThan('2008-09-01'):
                 <input type="submit" value="Ende" name="${p2.getLabel()|h}">
             % else:
                 <input type="submit" value="Ende" name="${p2.getLabel()|h}"