[Mpuls-commits] r2816 - in waska/branches/1.7: . waskaweb/templates/casemanagement

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-05-31 09:56:10 +0200 (Mon, 31 May 2010)
New Revision: 2816

Modified:
   waska/branches/1.7/ChangeLog
   waska/branches/1.7/waskaweb/templates/casemanagement/phase.mako
Log:
fix bug in warning dialog in phase overview

Modified: waska/branches/1.7/ChangeLog
===================================================================
--- waska/branches/1.7/ChangeLog	2010-05-31 07:34:54 UTC (rev 2815)
+++ waska/branches/1.7/ChangeLog	2010-05-31 07:56:10 UTC (rev 2816)
@@ -1,3 +1,7 @@
+2010-05-31 Roland Geider <roland.geider at intevation.de>
+	* waskaweb/templates/casemanagement/phase.mako: fixed error with dialog
+        in phase overview
+
 2010-05-28  Torsten Irländer <torsten.irlaender at intevation.de>
 
 	* waskaweb/templates/casemanagement/caselist.mako: Added icon for
@@ -15,17 +19,18 @@
 	* waskaweb/controllers/case.py (CaseController) Load tags when loading
 	a singe case or load ing the digest
 
-2010-03-18 Roland Geider <roland.geider at intevation.de>
-	* waskaweb/public/images/icons/status*:
-        * waskaweb/templates/casemanagement/caselist.mako: Added new status icons (also show if running
-        or stopped)
-
 2010-05-27 Roland Geider <roland.geider at intevation.de>
 
 	* waskaweb/templates/casemanagement/phase.mako: Show a dialog if the CM phase was aborted
 
-2010-03-18 Roland Geider <roland.geider at intevation.de>
 
+2010-05-18 Roland Geider <roland.geider at intevation.de>
+	* waskaweb/public/images/icons/status:
+        * waskaweb/templates/casemanagement/caselist.mako: Added new status icons (also show if running
+        or stopped)
+
+2010-05-18 Roland Geider <roland.geider at intevation.de>
+
 	Add the rules for CM start and end date to the XML import/export functions
 
 	* waskaweb/model/casexml.py: waskaweb/lib/xmlimport.py

Modified: waska/branches/1.7/waskaweb/templates/casemanagement/phase.mako
===================================================================
--- waska/branches/1.7/waskaweb/templates/casemanagement/phase.mako	2010-05-31 07:34:54 UTC (rev 2815)
+++ waska/branches/1.7/waskaweb/templates/casemanagement/phase.mako	2010-05-31 07:56:10 UTC (rev 2816)
@@ -44,10 +44,12 @@
       </td>
       <td>${h.dd_mm_YYYY(p1.getTime(), '-/-')}</td>
       <td style="text-align:right">
+      <% phase_disabled = False %>
         % if is_allowed:
         % if (((p1.isRecursiveComplete() and not p1.isRunning()) and  (p1.isNeighbor(c.current_phase) or c.current_phase.hasPredecessor(p1)) and not (c.disable_cm and c.current_phase.phase == 1 and p1.phase == 2) and not (c.disable_phase and c.current_phase.phase == 3 and p1.phase == 4)) or not            session.get('case').isYoungerThan('2008-09-01')):
                 <input type="submit" value="Start" name="${p1.getLabel()|h}">
             % else:
+                <% phase_disabled = True %>
                 <input type="submit" value="Start" name="${p1.getLabel()|h}"
                   disabled="disabled">
             % endif
@@ -65,12 +67,10 @@
       </td>
       <td class="table_row_h">${h.dd_mm_YYYY(p2.getTime(), '-/-')}</td>
       <td style="text-align:right" class="table_row_h">
-        <% phase_disabled = False %>
         % if is_allowed:
             % 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:
-                <% phase_disabled = True %>
                 <input type="submit" value="Ende" name="${p2.getLabel()|h}" 
                   disabled="disabled">
             % endif
@@ -86,7 +86,7 @@
 % if phase_disabled:
     <div class="form_errors">
       <h1>Start der Nachbetreeung wurde deaktiviert</h1>
-        <p>Der Start der Nachbetreeung wurde deaktiviert, weil die Phase Nachbetreeung mit <em>Abbruch</em>
+        <p>Der Start der Nachbetreeung wurde deaktiviert, weil die Phase Case Mananagement mit <em>Abbruch</em>
         beendet wurde.</p>
       </div>
 % endif