[Erp5-report] r21052 - /erp5/trunk/products/ERP5Form/

[nobody at svn.erp5.org]

Author: jm
Date: Wed May 21 11:55:31 2008
New Revision: 21052

URL: http://svn.erp5.org?rev=21052&view=rev
Log:
Make r21048 safer when calling render_view methods.

Modified:
    erp5/trunk/products/ERP5Form/DurationField.py
    erp5/trunk/products/ERP5Form/FormulatorPatch.py
    erp5/trunk/products/ERP5Form/ImageField.py
    erp5/trunk/products/ERP5Form/MultiRelationField.py
    erp5/trunk/products/ERP5Form/ParallelListField.py

Modified: erp5/trunk/products/ERP5Form/DurationField.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/DurationField.py?rev=21052&r1=21051&r2=21052&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/DurationField.py (original)
+++ erp5/trunk/products/ERP5Form/DurationField.py Wed May 21 11:55:31 2008
@@ -74,10 +74,10 @@
         sub_value, value = divmod(value, convertion)
       
       sub_field_render_list.append(self.render_sub_field_view(
-                                        field,sub_value, REQUEST))
+                                     field, sub_value, REQUEST=REQUEST))
     # Render second
     sub_field_render_list.append(self.render_sub_field_view(
-                                      field, value, REQUEST))
+                                   field, value, REQUEST=REQUEST))
     return ':'.join(sub_field_render_list)
 
   def render(self, field, key, value, REQUEST):
@@ -102,7 +102,7 @@
     Render dynamically a subfield
     """
     return FormulatorPatch.IntegerFieldWidgetInstance.render_view(field, value,
-                                                                  REQUEST)
+                                                               REQUEST=REQUEST)
 
   def render_sub_field(self, field, key, value, REQUEST, keyword):
     """

Modified: erp5/trunk/products/ERP5Form/FormulatorPatch.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/FormulatorPatch.py?rev=21052&r1=21051&r2=21052&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/FormulatorPatch.py (original)
+++ erp5/trunk/products/ERP5Form/FormulatorPatch.py Wed May 21 11:55:31 2008
@@ -71,7 +71,7 @@
 def Field_render_view(self, value=None, REQUEST=None):
     """Render value to be viewed.
     """
-    return self.widget.render_view(self, value, REQUEST)
+    return self.widget.render_view(self, value, REQUEST=REQUEST)
 
 def Field_render_sub_field(self, id, value=None, REQUEST=None, key=None):
     """Render a sub field, as part of complete rendering of widget in
@@ -103,7 +103,7 @@
     if self.get_value('hidden', REQUEST=REQUEST):
         return self.widget.render_hidden(self, key, value, REQUEST)
     elif (not self.get_value('editable', REQUEST=REQUEST)):
-        return self.widget.render_view(self, value, REQUEST)
+        return self.widget.render_view(self, value, REQUEST=REQUEST)
     else:
         return self.widget.render(self, key, value, REQUEST)
 
@@ -417,7 +417,7 @@
       """Render a non-editable interger."""
       if isinstance(value, float):
           value = int(value)
-      return TextWidget.render_view(self, field, value, REQUEST)
+      return TextWidget.render_view(self, field, value, REQUEST=REQUEST)
 
 
 from Products.Formulator.StandardFields import IntegerField

Modified: erp5/trunk/products/ERP5Form/ImageField.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/ImageField.py?rev=21052&r1=21051&r2=21052&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/ImageField.py (original)
+++ erp5/trunk/products/ERP5Form/ImageField.py Wed May 21 11:55:31 2008
@@ -69,7 +69,7 @@
     def render(self, field, key, value, REQUEST):
         """Render image field as a link to the image
         """
-        return self.render_view(field, value, REQUEST)
+        return self.render_view(field, value, REQUEST=REQUEST)
 
     def render_view(self, field, value, REQUEST=None):
         """Render image field as a link to the image

Modified: erp5/trunk/products/ERP5Form/MultiRelationField.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/MultiRelationField.py?rev=21052&r1=21051&r2=21052&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/MultiRelationField.py (original)
+++ erp5/trunk/products/ERP5Form/MultiRelationField.py Wed May 21 11:55:31 2008
@@ -294,7 +294,7 @@
     XXX Improved rendering required
     """
     html_string = self.default_widget_rendering_instance.render_view(
-                                                      field, value, REQUEST)
+                                                 field, value, REQUEST=REQUEST)
     if REQUEST is None:
       REQUEST = get_request()
     relation_html_string = self.render_relation_link(field, value, REQUEST)

Modified: erp5/trunk/products/ERP5Form/ParallelListField.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/ParallelListField.py?rev=21052&r1=21051&r2=21052&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/ParallelListField.py (original)
+++ erp5/trunk/products/ERP5Form/ParallelListField.py Wed May 21 11:55:31 2008
@@ -140,7 +140,7 @@
                 field.generate_subfield_key(sub_field_property_dict['key'],
                                             key=key),
                 sub_field_property_dict['value'],
-                REQUEST)
+                REQUEST=REQUEST)
       else:
         result = self.sub_widget[sub_field_property_dict['field_type']].render_view(
                 field,