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

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-09-03 10:37:59 +0200 (Fri, 03 Sep 2010)
New Revision: 3520

Modified:
   wasko/trunk/ChangeLog
   wasko/trunk/waskoweb/controllers/case.py
Log:
issue947: don't ask again for the declaration of consent

Modified: wasko/trunk/ChangeLog
===================================================================
--- wasko/trunk/ChangeLog	2010-09-02 14:02:07 UTC (rev 3519)
+++ wasko/trunk/ChangeLog	2010-09-03 08:37:59 UTC (rev 3520)
@@ -1,3 +1,8 @@
+2010-09-03  Roland Geider  <roland.geider at intevation.de>
+
+	* waskoweb/controllers/case.py: issue947: don't ask again for the
+	  declaration of consent
+
 2010-09-02  Frank Koormann <frank.koormann at intevation.de>
 
 	* waskoweb/public/formed/annotations.xhtml: Fix Issue1016: Missing help

Modified: wasko/trunk/waskoweb/controllers/case.py
===================================================================
--- wasko/trunk/waskoweb/controllers/case.py	2010-09-02 14:02:07 UTC (rev 3519)
+++ wasko/trunk/waskoweb/controllers/case.py	2010-09-03 08:37:59 UTC (rev 3520)
@@ -107,6 +107,7 @@
         try:
             form_result = validator.to_python(request.params)
             form_result.update(session_case.getData())
+            form_result['statement_signed'] = signed
             form_result['cm_neuauf_genehm'] = '1'
             form_result['cm2c']             = '1'
             form_result['cm_dok_end_art']   = '2'
@@ -132,12 +133,14 @@
         try:
             form_result = validator.to_python(request.params)
             form_result.update(session_case.getData())
+            
             # convert datefields back to strings:
             fields = ['cm_dok_datum_beendigung', 
                       'cm_wiederauf_genehm_datum_1', 
                       'cm_wiederauf_datum_bis_1']
             for k in fields:
                 form_result[k] = format_date(form_result.get(k))
+            form_result['statement_signed'] = signed
             form_result['cm_wiederauf_genehm_1'] = '1'
             form_result['cm2c']                  = '1'
             form_result['fn']                    = '_WA'