[Erp5-report] r31783 nicolas - /erp5/trunk/products/Formulator/Field.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Fri Jan 15 17:55:13 2010
New Revision: 31783

URL: http://svn.erp5.org?rev=31783&view=rev
Log:
* Let the field itself provide value to pass through renderer
* Unify renderer signatures
reviewed by Romain

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

Modified: erp5/trunk/products/Formulator/Field.py
URL: http://svn.erp5.org/erp5/trunk/products/Formulator/Field.py?rev=31783&r1=31782&r2=31783&view=diff
==============================================================================
--- erp5/trunk/products/Formulator/Field.py [utf8] (original)
+++ erp5/trunk/products/Formulator/Field.py [utf8] Fri Jan 15 17:55:13 2010
@@ -281,19 +281,22 @@
                                 render_prefix)
 
     security.declareProtected('View', 'render_odt')
-    def render_odt(self, value=None, as_string=True, ooo_builder=None,
+    def render_odt(self, key=None, value=None, as_string=True, ooo_builder=None,
         REQUEST=None, render_prefix=None, attr_dict=None, local_name='p'):
-      return self.widget.render_odt(self, value, as_string=as_string,
-          ooo_builder=ooo_builder, REQUEST=REQUEST,
-          render_prefix=render_prefix, attr_dict=attr_dict,
-          local_name=local_name)
+      widget_key = self.generate_field_key(key=key)
+      value = self._get_default(widget_key, value, REQUEST)
+      return self.widget.render_odt(self, value, as_string, ooo_builder,
+                                    REQUEST, render_prefix, attr_dict,
+                                    local_name)
 
     security.declareProtected('View', 'render_odg')
-    def render_odg(self, value=None, as_string=True, ooo_builder=None,
-        REQUEST=None, render_prefix=None, attr_dict=None):
-      return self.widget.render_odg(self, value, as_string=as_string,
-          ooo_builder=ooo_builder, REQUEST=REQUEST,
-          render_prefix=render_prefix, attr_dict=attr_dict)
+    def render_odg(self, key=None, value=None, as_string=True, ooo_builder=None,
+        REQUEST=None, render_prefix=None, attr_dict=None, local_name='p'):
+      widget_key = self.generate_field_key(key=key)
+      value = self._get_default(widget_key, value, REQUEST)
+      return self.widget.render_odg(self, value, as_string, ooo_builder,
+                                    REQUEST, render_prefix, attr_dict,
+                                    local_name)
 
     security.declareProtected('View', 'render_css')
     def render_css(self, REQUEST=None):