[Erp5-report] r11870 - /erp5/trunk/products/ERP5Form/FormulatorPatch.py

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Jan  3 11:22:40 2007
New Revision: 11870

URL: http://svn.erp5.org?rev=11870&view=rev
Log:
Make sure non editable FloatField text is not escaped.
FloatField.format_value should not fail if value is None.


Modified:
    erp5/trunk/products/ERP5Form/FormulatorPatch.py

Modified: erp5/trunk/products/ERP5Form/FormulatorPatch.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/FormulatorPatch.py?rev=11870&r1=11869&r2=11870&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/FormulatorPatch.py (original)
+++ erp5/trunk/products/ERP5Form/FormulatorPatch.py Wed Jan  3 11:22:40 2007
@@ -1040,7 +1040,8 @@
             value += value_list[1]
           if percent:
             value += '%'
-        return value.strip()
+          return value.strip()
+        return ''
 
     def render(self, field, key, value, REQUEST):
         """Render Float input field
@@ -1081,7 +1082,10 @@
         if extra not in (None, ''):
           value = "<div %s>%s</div>" % (extra, value)
 
-        return TextWidgetInstance.render_view(field, value)
+        css_class = field.get_value('css_class')
+        if css_class not in ('', None):
+          return "<span class='%s'>%s</span>" % (css_class, value)
+        return value
 
     def render_pdf(self, field, value):
         """Render the field as PDF."""