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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-10-06 13:08:48 +0200 (Wed, 06 Oct 2010)
New Revision: 3902

Modified:
   wasko/trunk/ChangeLog
   wasko/trunk/waskoweb/controllers/formularpage.py
Log:
* waskoweb/controllers/formularpage.py
(FormularpageController._before_set_data_hook): Formatting.


Modified: wasko/trunk/ChangeLog
===================================================================
--- wasko/trunk/ChangeLog	2010-10-06 10:57:55 UTC (rev 3901)
+++ wasko/trunk/ChangeLog	2010-10-06 11:08:48 UTC (rev 3902)
@@ -1,5 +1,10 @@
 2010-10-06  Bernhard Herzog  <bh at intevation.de>
 
+	* waskoweb/controllers/formularpage.py
+	(FormularpageController._before_set_data_hook): Formatting.
+
+2010-10-06  Bernhard Herzog  <bh at intevation.de>
+
 	More formularpage refactoring:
 
 	* waskoweb/controllers/formularpage.py

Modified: wasko/trunk/waskoweb/controllers/formularpage.py
===================================================================
--- wasko/trunk/waskoweb/controllers/formularpage.py	2010-10-06 10:57:55 UTC (rev 3901)
+++ wasko/trunk/waskoweb/controllers/formularpage.py	2010-10-06 11:08:48 UTC (rev 3902)
@@ -71,16 +71,15 @@
             # Reset the evaluation number is the young adult does not want
             # to participate in the survey or does not want his personal
             # data to be used
-            if form_result['teilnahme_evaluation:%s' % case_id] in \
-            [u'-1', u'1', u'3', u'4', u'5']:
+            if (form_result['teilnahme_evaluation:%s' % case_id]
+                in [u'-1', u'1', u'3', u'4', u'5']):
                 form_result['evaluation_nummer:%s' % case_id] = u''
 
             # The evaluation_nummer field might be grayed out, so it won't
             # be in the sent fields dictionary
             elif 'evaluation_nummer:%s' % case_id not in form_result:
-                agency = Agency()
                 # Generate the ID (we do not check for uniqueness). It is
                 # created from the evaluation abbreviation (agency wide) and
                 # a manually entered number or sequence
-                form_result['evaluation_nummer:%s' % case_id] = \
-                    u"%s-(bitte ergaenzen)" % (agency.getEvaluationId())
+                eval_id = u"%s-(bitte ergaenzen)" % Agency().getEvaluationId()
+                form_result['evaluation_nummer:%s' % case_id] = eval_id