[Mpuls-commits] r2293 - in wasko/branches/2.0: . mpulsweb/lib

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-04-09 12:12:16 +0200 (Fri, 09 Apr 2010)
New Revision: 2293

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/mpulsweb/lib/renderer.py
Log:
* mpulsweb/lib/renderer.py (ViewRenderer._renderRecursive): Use
the meta object's getParsedContainers method instead of parsing
the containers value explicitly here.  Makes the code much
simpler.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-04-09 08:55:48 UTC (rev 2292)
+++ wasko/branches/2.0/ChangeLog	2010-04-09 10:12:16 UTC (rev 2293)
@@ -1,3 +1,10 @@
+2010-04-09  Bernhard Herzog  <bh at intevation.de>
+
+	* mpulsweb/lib/renderer.py (ViewRenderer._renderRecursive): Use
+	the meta object's getParsedContainers method instead of parsing
+	the containers value explicitly here.  Makes the code much
+	simpler.
+
 2010-04-08  Roland Geider <roland.geider at intevation.de>
 
 	Graphic clean-up: updated icons and adapted templates and

Modified: wasko/branches/2.0/mpulsweb/lib/renderer.py
===================================================================
--- wasko/branches/2.0/mpulsweb/lib/renderer.py	2010-04-09 08:55:48 UTC (rev 2292)
+++ wasko/branches/2.0/mpulsweb/lib/renderer.py	2010-04-09 10:12:16 UTC (rev 2293)
@@ -836,18 +836,11 @@
 
     def _renderRecursive(self, node, doBreak=True, Cont=Container):
         meta = self._getMeta(node)
+        self.containersStack.append([Cont(c)
+                                     for c in meta.getParsedContainers()]
+                                    + [Cont(None)])
 
-        containers = meta.getContainers()
-
-        containers = (containers and [Cont(c.strip())
-                                      for c in containers.split(",")]
-                      or [])
-        containers.append(Cont(None))
-
-        self.containersStack.append(containers)
-
-        children = node.getChildren()
-        for child in children:
+        for child in node.getChildren():
             self._renderChild(child)
 
         out = []