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

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-05-04 14:42:20 +0200 (Tue, 04 May 2010)
New Revision: 2616

Modified:
   wasko/branches/2.0/mpulsweb/lib/renderer.py
Log:
* mpulsweb/lib/renderer.py (RepeatGroupRenderer.render_digest): Handle
groupings in choicenodes


Modified: wasko/branches/2.0/mpulsweb/lib/renderer.py
===================================================================
--- wasko/branches/2.0/mpulsweb/lib/renderer.py	2010-05-04 12:34:06 UTC (rev 2615)
+++ wasko/branches/2.0/mpulsweb/lib/renderer.py	2010-05-04 12:42:20 UTC (rev 2616)
@@ -964,7 +964,13 @@
                 if isinstance(self._getMeta(item), data.DateLeaf):
                     value = format_date(value)
                 if isinstance(self._getMeta(item), data.ChoiceNode):
+                    childs = []
                     for child in self._getMeta(item).getChildren():
+                        if isinstance(child, data.GroupNode):
+                            childs.extend(child.getChildren())
+                        else:
+                            childs.append(child)
+                    for child in childs:
                         if str(child.getValue()) == str(value):
                             value = child.getDescription()
                             break;