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

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-04-20 12:36:48 +0200 (Tue, 20 Apr 2010)
New Revision: 2433

Modified:
   wasko/branches/2.0/mpulsweb/templates/phase/phase.mako
Log:
* mpulsweb/templates/phase/phase.mako: Changed rendering of the
phasepage a bit. Make more clear which phases are ok (from the
required fields point of view)


Modified: wasko/branches/2.0/mpulsweb/templates/phase/phase.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/phase/phase.mako	2010-04-20 10:35:30 UTC (rev 2432)
+++ wasko/branches/2.0/mpulsweb/templates/phase/phase.mako	2010-04-20 10:36:48 UTC (rev 2433)
@@ -47,7 +47,8 @@
           % endif
           </span>
         </td>
-        % if p1.is_ok() and p1.is_neighbor(current_phase):
+        % if p1.is_ok(check_setting_phase=False) and (c.phases.is_on_path(p1.id, current_phase) or c.phases.is_on_path(current_phase, p1.id)): 
+
         <td class="ok"></td>
         % else:
         <td class="error"></td>
@@ -65,7 +66,7 @@
         </td>
       </tr>
       <tr class="${(num%2) and 'hl' or ''}">
-        % if p2.is_ok() and p2.is_neighbor(current_phase):
+        % if p2.is_ok(check_setting_phase=False) and (c.phases.is_on_path(p2.id, current_phase) or c.phases.is_on_path(current_phase, p2.id)): 
         <td class="ok"></td>
         % else:
         <td class="error"></td>