[Erp5-report] r12023 - /erp5/trunk/products/ERP5Form/ListBox.py

[nobody at svn.erp5.org]

Author: jp
Date: Thu Jan 11 15:25:45 2007
New Revision: 12023

URL: http://svn.erp5.org?rev=12023&view=rev
Log:
Fix bug #55

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

Modified: erp5/trunk/products/ERP5Form/ListBox.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/ListBox.py?rev=12023&r1=12022&r2=12023&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/ListBox.py (original)
+++ erp5/trunk/products/ERP5Form/ListBox.py Thu Jan 11 15:25:45 2007
@@ -1963,21 +1963,17 @@
           if isinstance(error_text, str):
             error_text = unicode(error_text, encoding)
           error_message = u'<br />' + error_text
-          processed_value = self.renderer.request.get('field_%s' % key, processed_value)
+          widget_key = editable_field.generate_field_key(key=key)
+          error_value = self.renderer.request.get(widget_key, None)
         else:
           error_message = u''
-
-        # XXX Formulator should be able to accept unicode.
-        if isinstance(processed_value, unicode):
-          display_value = processed_value.encode(encoding)
-        else:
-          display_value = processed_value
+          error_value = None
 
         # XXX this is a horrible hack.
         if editable_field.meta_type in ('DateTimeField', 'ProxyField', ):
           # XXX Some fields prefer None to ''.
           cell_html = editable_field.render( \
-                            value   = original_value
+                            value   = error_value or original_value
                           , REQUEST = brain.asContext( \
                                                REQUEST = self.renderer.request
                                              , form    = self.renderer.request.form
@@ -1991,7 +1987,7 @@
           # XXX (JPS) - render_view does not get REQUEST - this breaks so many possibilities
           REQUEST = get_request() # Dirtymax hack by JPS - render_view API update required
           REQUEST.cell = self.getObject()
-          cell_html = editable_field.render( value   = original_value
+          cell_html = editable_field.render( value   = error_value or original_value
                                            , REQUEST = brain
                                            , key     = key
                                            )