[Mpuls-commits] r5149 - in wasko/trunk: . waskoweb/controllers

[scm-commit@wald.intevation.org]

Author: ludwig
Date: 2011-07-01 10:22:03 +0200 (Fri, 01 Jul 2011)
New Revision: 5149

Modified:
   wasko/trunk/ChangeLog
   wasko/trunk/waskoweb/controllers/case.py
Log:
Fix small inconsistence in reopening after reintegration

Modified: wasko/trunk/ChangeLog
===================================================================
--- wasko/trunk/ChangeLog	2011-07-01 08:11:23 UTC (rev 5148)
+++ wasko/trunk/ChangeLog	2011-07-01 08:22:03 UTC (rev 5149)
@@ -1,5 +1,13 @@
 2011-07-01  Ludwig Reiter <ludwig.reiter at intevation.de>
 
+	* waskoweb/controllers/case.py:
+	Fixed small inconsistence. In reopening after integration if
+	cm_dok_end_art is "1" (normal school), then
+	cm_dok_end_verm_berufsschule is "-1", because no information
+	about this field are known.
+
+2011-07-01  Ludwig Reiter <ludwig.reiter at intevation.de>
+
 	* waskoweb/public/formed/formedtree.xml:
 	Fixed typo in ratio field beschul_d.
 

Modified: wasko/trunk/waskoweb/controllers/case.py
===================================================================
--- wasko/trunk/waskoweb/controllers/case.py	2011-07-01 08:11:23 UTC (rev 5148)
+++ wasko/trunk/waskoweb/controllers/case.py	2011-07-01 08:22:03 UTC (rev 5149)
@@ -144,9 +144,11 @@
             form_result['cm_wiederauf_genehm_1'] = '1'
             form_result['cm2c']                  = '1'
             form_result['fn']                    = '_WA'
-            form_result['cm_dok_end_verm_berufsschule' ] = form_result['cm_dok_end_verm' ]  
             if form_result['cm_dok_end_art'] == '4':
+                form_result['cm_dok_end_verm_berufsschule' ] = form_result['cm_dok_end_verm' ]  
                 form_result['cm_dok_end_verm' ] = '-1'
+            else:
+                form_result['cm_dok_end_verm_berufsschule' ] = '-1'
             form_result['datum_cm_start']        = form_result['cm_wiederauf_genehm_datum_1']
             case = self._createCase(form_result)
             return self.select(str(case.id))