[Mpuls-commits] r2572 - wasko/branches/2.0/mpulsweb/model

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-04-30 10:58:02 +0200 (Fri, 30 Apr 2010)
New Revision: 2572

Modified:
   wasko/branches/2.0/mpulsweb/model/phase.py
Log:
* mpulsweb/model/phase.py (Condition.evaluate): Readded evaluating
	only relevant fields. Was removed with last commit too.


Modified: wasko/branches/2.0/mpulsweb/model/phase.py
===================================================================
--- wasko/branches/2.0/mpulsweb/model/phase.py	2010-04-30 08:12:07 UTC (rev 2571)
+++ wasko/branches/2.0/mpulsweb/model/phase.py	2010-04-30 08:58:02 UTC (rev 2572)
@@ -396,6 +396,7 @@
     def evaluate(self):
         id = self.field.getIdentifier()
         context = RuleEvalContext(self.it, id)
+        if not self.is_relevant(): return True
         for result, variables in self.rule.getExpr().evaluate_instances(context):
             if not result and id in variables:
                 return False