[Mpuls-commits] r1812 - in waska/trunk: . formed

[scm-commit@wald.intevation.org]

Author: frank
Date: 2010-02-25 17:24:12 +0100 (Thu, 25 Feb 2010)
New Revision: 1812

Modified:
   waska/trunk/ChangeLog
   waska/trunk/formed/formedtree_web.xml
Log:
Conditional for "Evaluationsnummer" and KeyError Bugfix 


Modified: waska/trunk/ChangeLog
===================================================================
--- waska/trunk/ChangeLog	2010-02-25 16:17:21 UTC (rev 1811)
+++ waska/trunk/ChangeLog	2010-02-25 16:24:12 UTC (rev 1812)
@@ -1,5 +1,11 @@
 2010-02-18 	Frank Koormann <frank.koormann at intevation.de>
 
+	* formed/formedtree_web.xml: Add conditional "Evaluationsnummer"
+
+	* waskaweb/controllers/case.py (save): Bugfix for "KeyError"-ISE.
+	
+2010-02-18 	Frank Koormann <frank.koormann at intevation.de>
+
 	* formed/waska-hilfetexte.xhtml: Place help text at group caption
 
 	* formed/formedtree_web.xml: Change default value for evaluation.

Modified: waska/trunk/formed/formedtree_web.xml
===================================================================
--- waska/trunk/formed/formedtree_web.xml	2010-02-25 16:17:21 UTC (rev 1811)
+++ waska/trunk/formed/formedtree_web.xml	2010-02-25 16:24:12 UTC (rev 1812)
@@ -615,7 +615,9 @@
                 <bool checked="s" description="Einverständnis wurde nicht erfragt" name="nichterfragt" value="-1"/>
                 <bool description="hat sein Einverständnis widerrufen" name="widerrufen" value="5"/>
               </radio>
-              <text description="Evaluationsnummer" formularname="evaluation_nummer" maxlength="60" modes="default" name="evaluation_nummer" size="40" target="b"/>
+              <conditional expr="$teilnahme_evaluation 2 ==" name="conditional-4" target="b">
+                <text description="Evaluationsnummer" formularname="evaluation_nummer" maxlength="60" modes="default" name="evaluation_nummer" size="40" target="b"/>
+              </conditional>
             </group>
           </group>
           <group containers="a" description="Beratungsfall (nur ausfüllen wenn keine Übernahme in das CM)" name="fortfuehrung_beratung" target="d">