[Mpuls-commits] r1882 - in waska/trunk: . waskaweb/controllers

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-03-01 16:29:56 +0100 (Mon, 01 Mar 2010)
New Revision: 1882

Modified:
   waska/trunk/ChangeLog
   waska/trunk/waskaweb/controllers/case.py
Log:
Added page check

Modified: waska/trunk/ChangeLog
===================================================================
--- waska/trunk/ChangeLog	2010-03-01 15:26:38 UTC (rev 1881)
+++ waska/trunk/ChangeLog	2010-03-01 15:29:56 UTC (rev 1882)
@@ -1,3 +1,7 @@
+2010-03-01 	Roland Geider <roland.geider at intevation.de>
+
+	* waskaweb/controllers/case.py (save): [issue995] Added page check
+
 2010-02-18 	Frank Koormann <frank.koormann at intevation.de>
 
 	* formed/formedtree_web.xml: Add conditional "Evaluationsnummer"

Modified: waska/trunk/waskaweb/controllers/case.py
===================================================================
--- waska/trunk/waskaweb/controllers/case.py	2010-03-01 15:26:38 UTC (rev 1881)
+++ waska/trunk/waskaweb/controllers/case.py	2010-03-01 15:29:56 UTC (rev 1882)
@@ -538,15 +538,14 @@
         
         # If the young adult does not take part in the evaluation, the evaluation number
         # is (re)set to null
-        if request.params.getone('teilnahme_evaluation') in [u'-1', u'1', u'3', u'4', u'5']:
-            request_data['evaluation_nummer'] = ['']
-        # Generate the ID (we do not check for uniqueness)
-        # ID is created from the agency name, the evaluation abbreviation and a number
-        elif request.params.getone('evaluation_nummer') == '':
-            agency = Agency()
-            request_data['evaluation_nummer'] = [u"%s-(bitte ergänzen)" % (agency.getEvaluationId())]
-        
-        #print >> sys.stderr, request_data
+        if ti.page == "page_7":
+            if request.params.getone('teilnahme_evaluation') in [u'-1', u'1', u'3', u'4', u'5']:
+                request_data['evaluation_nummer'] = ['']
+            # Generate the ID (we do not check for uniqueness)
+            # ID is created from the agency name, the evaluation abbreviation and a number
+            elif request.params.getone('evaluation_nummer') == '':
+                agency = Agency()
+                request_data['evaluation_nummer'] = [u"%s-(bitte ergänzen)" % (agency.getEvaluationId())]
 
         # Get old formerrors, save data and store new formdata
         old_errors = case_session.getFormErrors()