=== ERP5Form/DurationField.py
==================================================================
--- ERP5Form/DurationField.py
+++ ERP5Form/DurationField.py
@@ -64,7 +64,7 @@
default="",
required=1)
- def render_view(self, field, value):
+ def render_view(self, field, value, REQUEST):
sub_field_render_list = []
for title, sub_key, convertion in (('Hour', 'hour', HOUR_IN_SECOND),
('Minute', 'minute', MINUTE_IN_SECOND)):
@@ -74,10 +74,10 @@
sub_value, value = divmod(value, convertion)
sub_field_render_list.append(self.render_sub_field_view(
- field,sub_value))
+ field,sub_value, REQUEST))
# Render second
sub_field_render_list.append(self.render_sub_field_view(
- field, value))
+ field, value, REQUEST))
return ':'.join(sub_field_render_list)
def render(self, field, key, value, REQUEST):
@@ -97,12 +97,12 @@
value, REQUEST, 'second'))
return ':'.join(sub_field_render_list)
- def render_sub_field_view(self, field, value):
+ def render_sub_field_view(self, field, value, REQUEST):
"""
Render dynamically a subfield
"""
- return FormulatorPatch.IntegerFieldWidgetInstance.render_view(field,
- value)
+ return FormulatorPatch.IntegerFieldWidgetInstance.render_view(field, value,
+ REQUEST)
def render_sub_field(self, field, key, value, REQUEST, keyword):
"""
=== ERP5Form/POSBox.py
==================================================================
--- ERP5Form/POSBox.py
+++ ERP5Form/POSBox.py
@@ -259,7 +259,7 @@
resource_category_fastResourceEntry = field.get_value('resource_category_fastResourceEntry')
)
- def render_view(self, field, value):
+ def render_view(self, field, value, REQUEST):
"""
Render point of sales widget
"""
=== ERP5Form/FormulatorPatch.py
==================================================================
--- ERP5Form/FormulatorPatch.py
+++ ERP5Form/FormulatorPatch.py
@@ -68,6 +68,11 @@
"""
return self._render_helper(self.generate_field_key(key=key), value, REQUEST)
+def Field_render_view(self, value=None, REQUEST=None):
+ """Render value to be viewed.
+ """
+ return self.widget.render_view(self, value, 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
a form. Works like render() but for sub field.
@@ -98,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)
+ return self.widget.render_view(self, value, REQUEST)
else:
return self.widget.render(self, key, value, REQUEST)
@@ -113,6 +118,7 @@
Field.generate_field_key = Field_generate_field_key
Field.render = Field_render
+Field.render_view = Field_render_view
Field.render_sub_field = Field_render_sub_field
Field.generate_subfield_key = Field_generate_subfield_key
Field.validate_sub_field = Field_validate_sub_field
@@ -307,7 +313,7 @@
CheckBoxWidget.render = CheckBoxWidget_render
-def CheckBoxWidget_render_view(self, field, value):
+def CheckBoxWidget_render_view(self, field, value, REQUEST):
"""Render checkbox in view mode.
"""
if value:
@@ -333,25 +339,27 @@
from urlparse import urljoin
class PatchedLinkWidget(TextWidget) :
- def render_view(self, field, value) :
+ def render_view(self, field, value, REQUEST) :
"""Render link.
"""
- REQUEST = get_request()
- link_type = field.get_value('link_type')
+ link_type = field.get_value('link_type', REQUEST=REQUEST)
+ if REQUEST is None:
+ REQUEST = get_request()
if link_type == 'internal':
value = urljoin(REQUEST['BASE0'], value)
elif link_type == 'relative':
value = urljoin(REQUEST['URL1'], value)
- return '%s' % (value, field.get_value('title', cell=REQUEST.get('cell')))
+ return '%s' % (value,
+ field.get_value('title', cell=getattr(REQUEST,'cell',None)))
PatchedLinkWidgetInstance = PatchedLinkWidget()
LinkField.widget = PatchedLinkWidgetInstance
# Patch the render_view of TextField to enclose the value within html tags if css class defined
-def TextWidget_patched_render_view(self, field, value):
+def TextWidget_patched_render_view(self, field, value, REQUEST):
"""Render text as non-editable.
This renderer is designed to be type error resistant.
in we get a non string value. It does escape the result
@@ -405,11 +413,11 @@
size=field.get_value('display_width'),
extra=field.get_value('extra'))
- def render_view(self, field, value):
+ def render_view(self, field, value, REQUEST):
"""Render a non-editable interger."""
if isinstance(value, float):
value = int(value)
- return TextWidget.render_view(self, field, value)
+ return TextWidget.render_view(self, field, value, REQUEST)
from Products.Formulator.StandardFields import IntegerField
@@ -489,7 +497,8 @@
Widget.render_hidden = Widget_render_hidden
# default render_pdf for a Widget
-Widget.render_pdf = Widget.render_view
+Widget.render_pdf = lambda self, field, value: \
+ Widget.render_view(self, field, value, None)
def Widget_render_css(self, field, REQUEST):
"""
@@ -696,7 +705,14 @@
# rendered_items.append(render_element('input', type='hidden', name="default_%s:int" % (key, ), value="0"))
return rendered_items
+def MultiItemsWidget_render_view(self, field, value, REQUEST):
+ if value is None:
+ return ''
+ return field.get_value('view_separator') \
+ .join(self.render_items_view(field, value))
+
MultiItemsWidget.render_items = MultiItemsWidget_render_items
+MultiItemsWidget.render_view = MultiItemsWidget_render_view
from Products.Formulator.Widget import MultiListWidget
@@ -745,14 +761,14 @@
return "\n".join([list_widget, input_hidden])
-def ListWidget_render_view(self, field, value):
+def ListWidget_render_view(self, field, value, REQUEST):
"""
This method is not as efficient as using a StringField in read only.
Always consider to change the field in your Form.
"""
if value is None:
return ''
- title_list = [x[0] for x in field.get_value("items") if x[1]==value]
+ title_list = [x[0] for x in field.get_value("items", REQUEST=REQUEST) if x[1]==value]
if len(title_list) == 0:
return "??? (%s)" % value
else:
@@ -761,7 +777,8 @@
ListWidget.render = ListWidget_render
ListWidget.render_view = ListWidget_render_view
-ListWidget.render_pdf = ListWidget_render_view
+ListWidget.render_pdf = lambda self, field, value: \
+ ListWidget_render_view(self, field, value, None)
# JPS - Subfield handling with listbox requires extension
from Products.Formulator.StandardFields import DateTimeField
@@ -984,7 +1001,7 @@
else:
return date_result
- def render_view(self, field, value):
+ def render_view(self, field, value, REQUEST):
return self.format_value(field, value, mode='html')
def render_pdf(self, field, value):
@@ -1322,7 +1339,7 @@
**extra_keys)
- def render_view(self, field, value):
+ def render_view(self, field, value, REQUEST):
"""
Render Float display field.
This patch add:
@@ -1495,12 +1512,12 @@
from Products.Formulator.TALESField import TALESWidget
-def TALESWidget_render_view(self, field, value):
+def TALESWidget_render_view(self, field, value, REQUEST):
"""
Render TALES as read only
"""
if value == None:
- text = field.get_value('default')
+ text = field.get_value('default', REQUEST=REQUEST)
else:
if value != "":
text = value._text
@@ -1557,7 +1574,7 @@
LinesTextAreaWidget.render = LinesTextAreaWidget_render
original_LinesTextAreaWidget_render_view = LinesTextAreaWidget.render_view
-def LinesTextAreaWidget_render_view(self, field, value):
+def LinesTextAreaWidget_render_view(self, field, value, REQUEST):
if isinstance(value, (str, unicode)):
value = [value]
return original_LinesTextAreaWidget_render_view(self, field, value)
=== ERP5Form/EditorField.py
==================================================================
--- ERP5Form/EditorField.py
+++ ERP5Form/EditorField.py
@@ -87,7 +87,7 @@
'inputname' : key
})
- def render_view(self, field, value):
+ def render_view(self, field, value, REQUEST):
"""
Render form in view only mode.
"""
=== ERP5Form/ParallelListField.py
==================================================================
--- ERP5Form/ParallelListField.py
+++ ERP5Form/ParallelListField.py
@@ -145,7 +145,7 @@
result = self.sub_widget[sub_field_property_dict['field_type']].render_view(
field,
sub_field_property_dict['value'],
- )
+ REQUEST)
for parameter in ('title', 'required', 'size', 'default', 'first_item',
'items'):
# As it doesn't seem possible to delete value in the REQUEST,
=== ERP5Form/MultiRelationField.py
==================================================================
--- ERP5Form/MultiRelationField.py
+++ ERP5Form/MultiRelationField.py
@@ -287,15 +287,16 @@
REQUEST.set('_v_relation_field_index', relation_field_index + 1)
return html_string
- def render_view(self, field, value):
+ def render_view(self, field, value, REQUEST):
"""
Render read only field.
XXX Improved rendering required
"""
html_string = self.default_widget_rendering_instance.render_view(
- field, value)
- REQUEST = get_request()
+ field, value, REQUEST)
+ if REQUEST is None:
+ REQUEST = get_request()
relation_html_string = self.render_relation_link(field, value, REQUEST)
if relation_html_string != '':
html_string += ' %s' % relation_html_string
=== ERP5Form/OOoChart.py
==================================================================
--- ERP5Form/OOoChart.py
+++ ERP5Form/OOoChart.py
@@ -378,7 +378,7 @@
return extra_argument_dict
- def render_view(self, field, value, key=None, REQUEST=None, render_format='html'):
+ def render_view(self, field, value, REQUEST, key=None, render_format='html'):
"""
Render a Chart in read-only.
"""
=== ERP5Form/ListBox.py
==================================================================
--- ERP5Form/ListBox.py
+++ ERP5Form/ListBox.py
@@ -355,7 +355,7 @@
required=0)
property_names.append('page_template')
- def render_view(self, field, value, REQUEST=None, render_format='html', key='listbox'):
+ def render_view(self, field, value, REQUEST, render_format='html', key='listbox'):
"""
Render a ListBox in read-only.
"""
=== ERP5Form/ImageField.py
==================================================================
--- ERP5Form/ImageField.py
+++ ERP5Form/ImageField.py
@@ -69,9 +69,9 @@
def render(self, field, key, value, REQUEST):
"""Render image field as a link to the image
"""
- return self.render_view(field, value)
+ return self.render_view(field, value, REQUEST)
- def render_view(self, field, value):
+ def render_view(self, field, value, REQUEST):
"""Render image field as a link to the image
"""
# Url is already defined in value