Commit bc1ff5cb authored by Nicolas Delaby's avatar Nicolas Delaby

These Fileds are not required anymore. by TD

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20360 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d6d7433e
...@@ -68,7 +68,7 @@ class OOoChartWidget(Widget.Widget): ...@@ -68,7 +68,7 @@ class OOoChartWidget(Widget.Widget):
description= \ description= \
"ID of the master form.", "ID of the master form.",
default="", default="",
required=1) required=0)
property_names.append('form_id') property_names.append('form_id')
field_id = fields.StringField( field_id = fields.StringField(
...@@ -77,7 +77,7 @@ class OOoChartWidget(Widget.Widget): ...@@ -77,7 +77,7 @@ class OOoChartWidget(Widget.Widget):
description= \ description= \
"ID of the listbox in the master form.", "ID of the listbox in the master form.",
default="", default="",
required=1) required=0)
property_names.append('field_id') property_names.append('field_id')
image_display = fields.ListField('image_display', image_display = fields.ListField('image_display',
...@@ -130,7 +130,7 @@ class OOoChartWidget(Widget.Widget): ...@@ -130,7 +130,7 @@ class OOoChartWidget(Widget.Widget):
description=( description=(
"A list of colors for each data associated to a column."), "A list of colors for each data associated to a column."),
default=[], default=[],
required=1) required=0)
property_names.append('colour_column_list') property_names.append('colour_column_list')
# vertical ="true" # vertical ="true"
...@@ -336,10 +336,16 @@ class OOoChartWidget(Widget.Widget): ...@@ -336,10 +336,16 @@ class OOoChartWidget(Widget.Widget):
""" Build argument Dict """ """ Build argument Dict """
def stringBoolean(value): def stringBoolean(value):
return str(bool(value)).lower() return str(bool(value)).lower()
form = field.aq_parent
form_id = field.get_value('form_id')
if form_id in ('', None):
form_id = form.getId()
field_id = field.get_value('field_id')
if field_id in ('', None):
field_id = 'listbox'
extra_argument_dict = dict( extra_argument_dict = dict(
chart_form_id = field.get_value('form_id'), chart_form_id = form_id,
chart_field_id = field.get_value('field_id'), chart_field_id = field_id,
chart_title = field.get_value('title'), chart_title = field.get_value('title'),
chart_type = field.get_value('chart_type'), chart_type = field.get_value('chart_type'),
colour_column_dict = dict(field.get_value('colour_column_list')), colour_column_dict = dict(field.get_value('colour_column_list')),
...@@ -410,9 +416,9 @@ class OOoChartWidget(Widget.Widget): ...@@ -410,9 +416,9 @@ class OOoChartWidget(Widget.Widget):
title = field.get_value('title') title = field.get_value('title')
alternate_name = field.get_value('alternate_name') alternate_name = field.get_value('alternate_name')
# Find the applicable context
form = field.aq_parent form = field.aq_parent
# Find the applicable context
here = getattr(form, 'aq_parent', REQUEST) here = getattr(form, 'aq_parent', REQUEST)
# Update the render format based on REQUEST parameters # Update the render format based on REQUEST parameters
render_format = getattr(REQUEST, 'render_format', render_format) render_format = getattr(REQUEST, 'render_format', render_format)
......
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