[Mpuls-commits] r1938 - in wasko/branches/2.0: . jmdweb/public/formed

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-03-12 15:08:38 +0100 (Fri, 12 Mar 2010)
New Revision: 1938

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/jmdweb/public/formed/formedtree.xml
Log:
* jmdweb/public/formed/formedtree.xml: Fix expression of
conditional testing the age of the person in case management.
Requires at least revision 98:a85388571608 of libformed.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-03-11 17:01:26 UTC (rev 1937)
+++ wasko/branches/2.0/ChangeLog	2010-03-12 14:08:38 UTC (rev 1938)
@@ -1,3 +1,9 @@
+2010-03-12  Bernhard Herzog  <bh at intevation.de>
+
+	* jmdweb/public/formed/formedtree.xml: Fix expression of
+	conditional testing the age of the person in case management.
+	Requires at least revision 98:a85388571608 of libformed.
+
 2010-03-11  Bernhard Herzog  <bh at intevation.de>
 
 	* mpulsweb/controllers/formularpage.py (convert_error_items):

Modified: wasko/branches/2.0/jmdweb/public/formed/formedtree.xml
===================================================================
--- wasko/branches/2.0/jmdweb/public/formed/formedtree.xml	2010-03-11 17:01:26 UTC (rev 1937)
+++ wasko/branches/2.0/jmdweb/public/formed/formedtree.xml	2010-03-12 14:08:38 UTC (rev 1938)
@@ -173,7 +173,7 @@
               <text description="E-Mail" function="suppress_value" maxlength="60" name="email" size="40" target="d"/>
             </group>
           </repeat>
-          <conditional description="Nur wenn minderjährig" expr="today $geburtsdatum - 18 &lt;" name="conditional-15">
+          <conditional description="Nur wenn minderjährig" expr="$geburtsdatum isset not $geburtsdatum known not or $geburtsdatum today year 18 &lt; or" name="conditional-15">
             <repeat containers="a,b" description="Sorgeberechtigte" min="1" name="rg_kontaktdaten_sorgeberechtiger" target="e">
               <group containers="a,b" description="Anschrift" name="group-19" target="a">
                 <text description="Name" function="suppress_value" maxlength="128" name="name_sorge" size="40" target="a"/>