[Formed-commits] r444 - in trunk: . formed/formed/plugins/export

[scm-commit@wald.intevation.org]

Author: roland
Date: 2011-03-15 09:05:37 +0100 (Tue, 15 Mar 2011)
New Revision: 444

Modified:
   trunk/ChangeLog
   trunk/formed/formed/plugins/export/xls.py
Log:
Generate correct XLS if there are conditionals in Choices

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-03-14 09:50:50 UTC (rev 443)
+++ trunk/ChangeLog	2011-03-15 08:05:37 UTC (rev 444)
@@ -1,3 +1,8 @@
+2011-03-15  Roland Geider  <roland.geider at intevation.de>
+
+	* formed/formed/plugins/export/xls.py: Generate correct XLS if there
+	  are conditionals in Choices.
+
 2011-03-14  Roland Geider  <roland.geider at intevation.de>
 
 	* formed/formed/plugins/export/xsd.py,

Modified: trunk/formed/formed/plugins/export/xls.py
===================================================================
--- trunk/formed/formed/plugins/export/xls.py	2011-03-14 09:50:50 UTC (rev 443)
+++ trunk/formed/formed/plugins/export/xls.py	2011-03-15 08:05:37 UTC (rev 444)
@@ -244,6 +244,9 @@
                     if cc: stack.extend(cc)
                 elif isinstance(c, data.GroupNode):
                     stack.extend(c.children)
+                # Also add options if they are defined in a conditional
+                elif isinstance(c, data.ConditionalNode):
+                    stack.extend(c.children)
                 elif isinstance(c, data.BoolLeaf):
                     desc = c.getDescription()
                     if not desc: desc = ""