Commit 751f65a3 authored by Fabien Morin's avatar Fabien Morin

small optimisation :

- remove unused _renderField method
- improve ODGStrategy._replaceXmlByForm


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31211 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 39f0eb0b
...@@ -871,11 +871,6 @@ class ODTStrategy(ODFStrategy): ...@@ -871,11 +871,6 @@ class ODTStrategy(ODFStrategy):
self._replaceNodeViaPointReference(element_tree, field) self._replaceNodeViaPointReference(element_tree, field)
self._replaceNodeViaFormName(element_tree, field) self._replaceNodeViaFormName(element_tree, field)
def _renderField(self, field):
# XXX It looks ugly to use render_pdf to extract text. Probably
# it should be renamed to render_text.
return field.render_pdf(field.get_value('default'))
def _replaceNodeViaPointReference(self, element_tree, field, iteration_index=0): def _replaceNodeViaPointReference(self, element_tree, field, iteration_index=0):
"""Replace text node via an ODF point reference. """Replace text node via an ODF point reference.
...@@ -952,17 +947,15 @@ class ODTStrategy(ODFStrategy): ...@@ -952,17 +947,15 @@ class ODTStrategy(ODFStrategy):
class ODGStrategy(ODFStrategy): class ODGStrategy(ODFStrategy):
"""ODGStrategy create a ODG Document from a form and a ODG template""" """ODGStrategy create a ODG Document from a form and a ODG template"""
def _replaceXmlByForm(self, element_tree, form, here, extra_context, ooo_builder, iteration_index=0): def _replaceXmlByForm(self, element_tree, form, here, extra_context,
ooo_builder, iteration_index=0):
field_list = form.get_fields(include_disabled=1) field_list = form.get_fields(include_disabled=1)
REQUEST = here.REQUEST
for (count, field) in enumerate(field_list): for (count, field) in enumerate(field_list):
text_xpath = '//draw:frame[@draw:name="%s"]/*' % field.id text_xpath = '//draw:frame[@draw:name="%s"]/*' % field.id
node_list = element_tree.xpath(text_xpath, namespaces=element_tree.nsmap) node_list = element_tree.xpath(text_xpath, namespaces=element_tree.nsmap)
if not node_list: for target_node in node_list:
continue attr_dict = {}
attr_dict.update(target_node.attrib)
new_node = field.widget.render_odg(field, as_string=False)#XXXrender_odg should be called on field, not on widget new_node = field.render_odt(attr_dict=attr_dict)
for node in node_list: parent_node = target_node.getparent().replace(target_node, new_node)
parent_node = node.getparent().replace(node, new_node)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment