[Mpuls-commits] r3770 - in wasko/trunk/waskoweb: controllers lib templates/casemanagement

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-09-23 18:09:32 +0200 (Thu, 23 Sep 2010)
New Revision: 3770

Modified:
   wasko/trunk/waskoweb/controllers/caselifetime.py
   wasko/trunk/waskoweb/lib/validators.py
   wasko/trunk/waskoweb/templates/casemanagement/neuaufnahme.mako
   wasko/trunk/waskoweb/templates/casemanagement/wiederaufnahme.mako
Log:
Fixes for issue1209


Modified: wasko/trunk/waskoweb/controllers/caselifetime.py
===================================================================
--- wasko/trunk/waskoweb/controllers/caselifetime.py	2010-09-23 14:44:22 UTC (rev 3769)
+++ wasko/trunk/waskoweb/controllers/caselifetime.py	2010-09-23 16:09:32 UTC (rev 3770)
@@ -259,7 +259,7 @@
              and c.erfolgreiche_reintegration
              and c.num_wiederaufnahme < 1
              and c.is_anonymizable)
-        or (c.num_wiederaufnahme == 1 and c.phase not in (3, 4, 5))):
+        or (c.num_wiederaufnahme == 1 and c.phase not in (-1, 0, 1, 3, 4, 5))):
         c.show_wiedervorlage = True
     else:
         c.show_wiedervorlage = False

Modified: wasko/trunk/waskoweb/lib/validators.py
===================================================================
--- wasko/trunk/waskoweb/lib/validators.py	2010-09-23 14:44:22 UTC (rev 3769)
+++ wasko/trunk/waskoweb/lib/validators.py	2010-09-23 16:09:32 UTC (rev 3770)
@@ -151,6 +151,6 @@
 
     cm_dok_datum_beendigung = DateCheck(not_empty=True)
     cm_dok_end_sonst = KeineAngabe()
-    cm2c_t = String()
+    cm2c_t = String(not_empty=True)
 
 # vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8

Modified: wasko/trunk/waskoweb/templates/casemanagement/neuaufnahme.mako
===================================================================
--- wasko/trunk/waskoweb/templates/casemanagement/neuaufnahme.mako	2010-09-23 14:44:22 UTC (rev 3769)
+++ wasko/trunk/waskoweb/templates/casemanagement/neuaufnahme.mako	2010-09-23 16:09:32 UTC (rev 3770)
@@ -55,7 +55,7 @@
       <td class="field">
         <textarea onchange="setModification();" rows="2" id="cm2c_t" name="cm2c_t" class=""></textarea>
       </td>
-      <td></td>
+      <td><form:error name="cm2c_t"></td>
     </tr>
   </table>
 </fieldset>

Modified: wasko/trunk/waskoweb/templates/casemanagement/wiederaufnahme.mako
===================================================================
--- wasko/trunk/waskoweb/templates/casemanagement/wiederaufnahme.mako	2010-09-23 14:44:22 UTC (rev 3769)
+++ wasko/trunk/waskoweb/templates/casemanagement/wiederaufnahme.mako	2010-09-23 16:09:32 UTC (rev 3770)
@@ -42,7 +42,7 @@
           <option value="3">andere Schule</option>
         </select>
       </td>
-      <td></td>
+      <td><form:error name="cm_dok_end_verm"></td>
     </tr>
     <tr>
       <td class="label">