[Erp5-report] r20360 - /erp5/trunk/products/ERP5Form/OOoChart.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Tue Apr  8 17:38:42 2008
New Revision: 20360

URL: http://svn.erp5.org?rev=20360&view=rev
Log:
These Fileds are not required anymore. by TD

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

Modified: erp5/trunk/products/ERP5Form/OOoChart.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/OOoChart.py?rev=20360&r1=20359&r2=20360&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/OOoChart.py (original)
+++ erp5/trunk/products/ERP5Form/OOoChart.py Tue Apr  8 17:38:42 2008
@@ -68,7 +68,7 @@
                               description= \
                                 "ID of the master form.",
                               default="",
-                              required=1)
+                              required=0)
   property_names.append('form_id')
 
   field_id = fields.StringField(
@@ -77,7 +77,7 @@
                               description= \
                                 "ID of the listbox in the master form.",
                               default="",
-                              required=1)
+                              required=0)
   property_names.append('field_id')
 
   image_display = fields.ListField('image_display',
@@ -130,7 +130,7 @@
                               description=(
     "A list of colors for each data associated to a column."),
                               default=[],
-                              required=1)
+                              required=0)
   property_names.append('colour_column_list')
 
   # vertical ="true"
@@ -336,10 +336,16 @@
     """ Build argument Dict """
     def stringBoolean(value):
       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(
-      chart_form_id = field.get_value('form_id'),
-      chart_field_id = field.get_value('field_id'),
+      chart_form_id = form_id,
+      chart_field_id = field_id,
       chart_title = field.get_value('title'),
       chart_type = field.get_value('chart_type'),
       colour_column_dict = dict(field.get_value('colour_column_list')),
@@ -410,9 +416,9 @@
 
     title = field.get_value('title')
     alternate_name = field.get_value('alternate_name')
-
+    form = field.aq_parent
+    
     # Find the applicable context
-    form = field.aq_parent
     here = getattr(form, 'aq_parent', REQUEST)
     # Update the render format based on REQUEST parameters
     render_format = getattr(REQUEST, 'render_format', render_format)