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

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-08-09 15:40:14 +0200 (Mon, 09 Aug 2010)
New Revision: 388

Modified:
   trunk/formed/formed/plugins/modify/rules.py
Log:
Fixed rule generation for rules using TODAY keyword.


Modified: trunk/formed/formed/plugins/modify/rules.py
===================================================================
--- trunk/formed/formed/plugins/modify/rules.py	2010-08-09 13:37:53 UTC (rev 387)
+++ trunk/formed/formed/plugins/modify/rules.py	2010-08-09 13:40:14 UTC (rev 388)
@@ -29,16 +29,16 @@
 u"%(a)s isset %(a)s known and %(b)s isset %(b)s known and and %(a)s %(b)s > and not"
 
 IN_PAST_EXPR = \
-u"%(a)s isset %(a)s known and %(a)s today > and not"
+u"%(a)s isset %(a)s known and %(a)s today >= and not"
 
 IN_PAST_VALUE = \
 u"'%(a_desc)s' darf nicht in der Zukunft liegen."
 
 IN_PAST_DESC = \
-"'%(a)s' muss in der Vergangenheit liegen."
+"'%(a)s' darf nicht in der Zukunft liegen."
 
 IN_FUTURE_EXPR = \
-u"%(a)s isset %(a)s known and today %(a)s > and not"
+u"%(a)s isset %(a)s known and today %(a)s >= and not"
 
 IN_FUTURE_DESC = \
 u"'%(a)s muss in der Zukunft liegen.'"
@@ -364,7 +364,7 @@
         rule_counter = len(known_fields)
 
         for w in widgets:
-            if w.getName() in known_fields: continue
+            #if w.getName() in known_fields: continue
             flags = w.getFlags()
             if flags.find('required') >= 0:
                 x = var_type.substitute(w.getName())