Commit f22d46e5 authored by Jean-Paul Smets's avatar Jean-Paul Smets

Fix bug #55

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@12023 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 2f9dae45
...@@ -1963,21 +1963,17 @@ class ListBoxHTMLRendererLine(ListBoxRendererLine): ...@@ -1963,21 +1963,17 @@ class ListBoxHTMLRendererLine(ListBoxRendererLine):
if isinstance(error_text, str): if isinstance(error_text, str):
error_text = unicode(error_text, encoding) error_text = unicode(error_text, encoding)
error_message = u'<br />' + error_text 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: else:
error_message = u'' error_message = u''
error_value = None
# XXX Formulator should be able to accept unicode.
if isinstance(processed_value, unicode):
display_value = processed_value.encode(encoding)
else:
display_value = processed_value
# XXX this is a horrible hack. # XXX this is a horrible hack.
if editable_field.meta_type in ('DateTimeField', 'ProxyField', ): if editable_field.meta_type in ('DateTimeField', 'ProxyField', ):
# XXX Some fields prefer None to ''. # XXX Some fields prefer None to ''.
cell_html = editable_field.render( \ cell_html = editable_field.render( \
value = original_value value = error_value or original_value
, REQUEST = brain.asContext( \ , REQUEST = brain.asContext( \
REQUEST = self.renderer.request REQUEST = self.renderer.request
, form = self.renderer.request.form , form = self.renderer.request.form
...@@ -1991,7 +1987,7 @@ class ListBoxHTMLRendererLine(ListBoxRendererLine): ...@@ -1991,7 +1987,7 @@ class ListBoxHTMLRendererLine(ListBoxRendererLine):
# XXX (JPS) - render_view does not get REQUEST - this breaks so many possibilities # 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 = get_request() # Dirtymax hack by JPS - render_view API update required
REQUEST.cell = self.getObject() 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 , REQUEST = brain
, key = key , key = key
) )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment