[Erp5-report] r31250 fabien - /erp5/trunk/products/ERP5OOo/FormPrintout.py

[nobody at svn.erp5.org]

Author: fabien
Date: Fri Dec 11 16:55:53 2009
New Revision: 31250

URL: http://svn.erp5.org?rev=31250&view=rev
Log:
- improve the way to store attributes.
- remove "if new_node is not None" expression because now their is a render_odg
  method defined on Widget Class

Modified:
    erp5/trunk/products/ERP5OOo/FormPrintout.py

Modified: erp5/trunk/products/ERP5OOo/FormPrintout.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/FormPrintout.py?rev=31250&r1=31249&r2=31250&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/FormPrintout.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/FormPrintout.py [utf8] Fri Dec 11 16:55:53 2009
@@ -956,8 +956,8 @@
       node_list = element_tree.xpath(text_xpath, namespaces=element_tree.nsmap)
       for target_node in node_list:
         attr_dict = {}
-        attr_dict.update(target_node.attrib)
+        # store child style using their local-name as key
+        for descendant in target_node.iterdescendants():
+          attr_dict.setdefault(descendant.tag, {}).update(descendant.attrib)
         new_node = field.render_odg(attr_dict=attr_dict)
-        if new_node is not None: # XXX None node exists because render_odg is
-                                 # not yet writed for all fields, but it should
-          parent_node = target_node.getparent().replace(target_node, new_node)
+        parent_node = target_node.getparent().replace(target_node, new_node)