[Erp5-report] r40521 nicolas - /erp5/trunk/products/Formulator/Widget.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Tue Nov 23 11:22:29 2010
New Revision: 40521

URL: http://svn.erp5.org?rev=40521&view=rev
Log:
Render odg_view must not fallback on render_odt as nodes are different in ODT and ODG.
DateTimeWidget.render_odg_view consist into transform DateTime value into string
then call default render_odg_view renderer with casted value.

Modified:
    erp5/trunk/products/Formulator/Widget.py

Modified: erp5/trunk/products/Formulator/Widget.py
URL: http://svn.erp5.org/erp5/trunk/products/Formulator/Widget.py?rev=40521&r1=40520&r2=40521&view=diff
==============================================================================
--- erp5/trunk/products/Formulator/Widget.py [utf8] (original)
+++ erp5/trunk/products/Formulator/Widget.py [utf8] Tue Nov 23 11:22:29 2010
@@ -1490,15 +1490,16 @@ class DateTimeWidget(Widget):
       return etree.tostring(text_node)
     return text_node
 
-  def render_odg(self, field, value, as_string, ooo_builder, REQUEST,
-      render_prefix, attr_dict, local_name):
-    """
-      Return a field value rendered in odt format.
-      - as_string return value as string or as xml object
-      - attr_dict can be used for additional attributes (like style).
+  def render_odg_view(self, field, value, as_string, ooo_builder, REQUEST,
+                      render_prefix, attr_dict, local_name):
+    """Transform DateTime into string then call default renderer
     """
-    return self.render_odt(field, value, as_string, ooo_builder, REQUEST,
-                           render_prefix, attr_dict, local_name)
+    if not value and field.get_value('default_now'):
+      value = DateTime()
+    value_as_text = self.format_value(field, value, mode='pdf').decode('utf-8')
+    return Widget.render_odg_view(self, field, value_as_text, as_string,
+                                      ooo_builder, REQUEST, render_prefix,
+                                      attr_dict, local_name)
 
 DateTimeWidgetInstance = DateTimeWidget()