[Mpuls-commits] r2353 - wasko/branches/2.0/mpulsweb/templates/phase

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-04-15 08:49:36 +0200 (Thu, 15 Apr 2010)
New Revision: 2353

Modified:
   wasko/branches/2.0/mpulsweb/templates/phase/phase.mako
Log:
* mpulsweb/templates/phase/phase.mako: Wald #1362: Proposal for a
solution. Only mark phases as ok if a) all required fields are filled
out and b) the phase is a neighbor of the current phase and can be
switched into it.


Modified: wasko/branches/2.0/mpulsweb/templates/phase/phase.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/phase/phase.mako	2010-04-15 06:28:16 UTC (rev 2352)
+++ wasko/branches/2.0/mpulsweb/templates/phase/phase.mako	2010-04-15 06:49:36 UTC (rev 2353)
@@ -47,7 +47,7 @@
           % endif
           </span>
         </td>
-        % if p1.is_ok():
+        % if p1.is_ok() and p1.is_neighbor(current_phase):
         <td class="ok"></td>
         % else:
         <td class="error"></td>
@@ -65,7 +65,7 @@
         </td>
       </tr>
       <tr class="${(num%2) and 'hl' or ''}">
-        % if p2.is_ok():
+        % if p2.is_ok() and p2.is_neighbor(current_phase):
         <td class="ok"></td>
         % else:
         <td class="error"></td>