[Mpuls-commits] r420 - in wasko/trunk: . waskaweb/lib

[scm-commit@wald.intevation.org]

Author: teichmann
Date: 2009-03-20 11:22:46 +0100 (Fri, 20 Mar 2009)
New Revision: 420

Modified:
   wasko/trunk/ChangeLog.txt
   wasko/trunk/waskaweb/lib/renderer.py
Log:
Merged


Modified: wasko/trunk/ChangeLog.txt
===================================================================
--- wasko/trunk/ChangeLog.txt	2009-03-20 09:58:53 UTC (rev 419)
+++ wasko/trunk/ChangeLog.txt	2009-03-20 10:22:46 UTC (rev 420)
@@ -1,3 +1,8 @@
+2009-03-20	Sascha L. Teichmann <teichmann at intevation.de>
+
+	* waskaweb/lib/renderer.py: Evaluate conditionals in a way not to
+	  destroy the layout.
+
 2009-03-20	Torsten Irlaender  <torsten.irlaender at intevation.de> 
 
 	Set version string to 0.7.1-preview

Modified: wasko/trunk/waskaweb/lib/renderer.py
===================================================================
--- wasko/trunk/waskaweb/lib/renderer.py	2009-03-20 09:58:53 UTC (rev 419)
+++ wasko/trunk/waskaweb/lib/renderer.py	2009-03-20 10:22:46 UTC (rev 420)
@@ -387,14 +387,15 @@
             if ro:
                 old_ro = self.ro_mode
                 self.ro_mode = True
-                out = self._renderRecursive(conditional)
+                for child in conditional.children:
+                    out = self._renderChild(child)
                 self.ro_mode = old_ro
+            else:
+                self.toTarget(Text(""), conditional.getTarget())
         else:
-            out = self._renderRecursive(conditional)
+            for child in conditional.children:
+                out = self._renderChild(child)
 
-        self.toTarget(Text(out), conditional.getTarget())
-
-
     def _renderMatrix(self, node):
         description = node.getDescription()
         name        = node.getName()