[Formed-commits] r360 - trunk/formed/formed/plugins/modify

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-04-30 11:20:28 +0200 (Fri, 30 Apr 2010)
New Revision: 360

Modified:
   trunk/formed/formed/plugins/modify/rules.py
Log:
* formed/formed/plugins/modify/rules.py (VariableType.substitute): Do
	not generate "%"-rules for required fields in repeat-groups.


Modified: trunk/formed/formed/plugins/modify/rules.py
===================================================================
--- trunk/formed/formed/plugins/modify/rules.py	2010-04-28 08:07:00 UTC (rev 359)
+++ trunk/formed/formed/plugins/modify/rules.py	2010-04-30 09:20:28 UTC (rev 360)
@@ -70,7 +70,7 @@
                         is_repeat = True
                         break
                     nc = nc.parent
-                value = "%s%s" % (is_repeat and "%" or "$", name)
+                value = "%s%s" % ("$", name)
             self.entities[name] = value
             return value
 
@@ -269,7 +269,7 @@
             rule.setDescription(IN_FUTURE_DESC % { 'a': d })
             rule.setMark("error:%s" % d)
             d1 = dates[d]
-            rule.setValue(IN_FUTURE_EXPR_VALUE % { 'a_desc': u" / ".join(descriptions(d1)) })
+            rule.setValue(IN_FUTURE_VALUE % { 'a_desc': u" / ".join(descriptions(d1)) })
             d1.getParent().addChild(rule)
 
         for d in today_in_future.copy():