[Mpuls-commits] r2405 - wasko/branches/2.0/mpulsweb/lib

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-04-19 11:02:36 +0200 (Mon, 19 Apr 2010)
New Revision: 2405

Modified:
   wasko/branches/2.0/mpulsweb/lib/renderer.py
Log:
* mpulsweb/lib/renderer.py (ViewRenderer._renderConditional): Wald
#1367. Fixed rendering of conditionals.


Modified: wasko/branches/2.0/mpulsweb/lib/renderer.py
===================================================================
--- wasko/branches/2.0/mpulsweb/lib/renderer.py	2010-04-19 08:18:37 UTC (rev 2404)
+++ wasko/branches/2.0/mpulsweb/lib/renderer.py	2010-04-19 09:02:36 UTC (rev 2405)
@@ -523,7 +523,7 @@
                     self._renderChild(child)
                 self.ro_mode = old_ro
             else:
-                self.toTarget(Text(""), meta.getTarget())
+                pass # do nothing when it is invisible
         else:
             for child in conditional.getChildren():
                 self._renderChild(child)
@@ -846,6 +846,14 @@
             elif isinstance(meta, data.PageNode):
                 self._renderPage(child)
             elif isinstance(meta, data.ConditionalNode):
+                #if not self.it.evaluate_conditional(child):
+                #    meta = self._getMeta(child)
+                #    if not meta.isInvisible():
+                #        self._renderConditional(child)
+                #    else:
+                #        pass
+                #else:
+                #    self._renderConditional(child)
                 self._renderConditional(child)
             else:
                 self.toTarget(Item(self._renderRecursive(child)),