[Mpuls-commits] r719 - in waska/trunk/waskaweb: lib templates/casemanagement

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-12-02 09:11:18 +0100 (Wed, 02 Dec 2009)
New Revision: 719

Modified:
   waska/trunk/waskaweb/lib/renderer.py
   waska/trunk/waskaweb/templates/casemanagement/phase.mako
Log:
Merged with 1.5.6


Modified: waska/trunk/waskaweb/lib/renderer.py
===================================================================
--- waska/trunk/waskaweb/lib/renderer.py	2009-12-02 07:41:46 UTC (rev 718)
+++ waska/trunk/waskaweb/lib/renderer.py	2009-12-02 08:11:18 UTC (rev 719)
@@ -383,7 +383,7 @@
         v1 = self.formdata.getData('letzte_jahr_allg_schule')
         v2 = self.formdata.getData('prognose_liegt_vor')
         v3 = self.formdata.getData('zugang_kompetenzagentur')
-        if v3 == '10' and (v1 == '0' or (v1 == '1' and  v2 == '0')):
+        if v3 == '23' and (v1 == '0' or (v1 == '1' and  v2 == '0')):
             out.append(DIALOG_SCHUELER1)
         if not self.ro_mode:
             out.append('<form id="waska_form" action="')

Modified: waska/trunk/waskaweb/templates/casemanagement/phase.mako
===================================================================
--- waska/trunk/waskaweb/templates/casemanagement/phase.mako	2009-12-02 07:41:46 UTC (rev 718)
+++ waska/trunk/waskaweb/templates/casemanagement/phase.mako	2009-12-02 08:11:18 UTC (rev 719)
@@ -45,7 +45,7 @@
       <td>${h.dd_mm_YYYY(p1.getTime(), '-/-')}</td>
       <td style="text-align:right">
         % 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) or not session.get('case').isYoungerThan('2008-09-01'):
+            % 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) or not session.get('case').isYoungerThan('2008-09-01'):
                 <input type="submit" value="Start" name="${p1.getLabel()|h}">
             % else:
                 <input type="submit" value="Start" name="${p1.getLabel()|h}"