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

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Thu Mar 11 12:56:04 2010
New Revision: 33633

URL: http://svn.erp5.org?rev=33633&view=rev
Log:
fix TestListbox.test_08_ExtraAndCssFieldsInLinesField: when rendering
non-editable LinesField/TextArea, use a <div> instead of the bare value to
be able to include CSS and Extra attributes

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=33633&r1=33632&r2=33633&view=diff
==============================================================================
--- erp5/trunk/products/Formulator/Widget.py [utf8] (original)
+++ erp5/trunk/products/Formulator/Widget.py [utf8] Thu Mar 11 12:56:04 2010
@@ -531,9 +531,10 @@
                             extra=field.get_value('extra'))
 
     def render_view(self, field, value, REQUEST, render_prefix=None):
-        if value is None:
-          return ''
-        return value
+        return render_element("div",
+                              css_class=field.get_value('css_class'),
+                              contents=html_quote(value),
+                              extra=field.get_value('extra'))
 
     def render_odt_view(self, field, value, as_string, ooo_builder, REQUEST,
         render_prefix, attr_dict, local_name):
@@ -593,7 +594,12 @@
       return ''
     elif isinstance(value, (str, unicode)):
       value = [value]
-    return string.join(value, field.get_value('view_separator'))
+    return TextAreaWidget.render_view(
+        self,
+        field,
+        string.join(value, field.get_value('view_separator')),
+        REQUEST,
+    )
 
   def render_odt_view(self, field, value, as_string, ooo_builder, REQUEST,
       render_prefix, attr_dict, local_name):