Fix compatibility between ProxyField and RelationField.

Remove a possible conflict error (do not write in the ZODB if it's useless).


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@11658 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Form/FormulatorPatch.py

@@ -1108,7 +1108,7 @@ def Field_render_htmlgrid(self, value=None, REQUEST=None, key=None):
   """
   # What about CSS ? What about description ? What about error ?
   widget_key = self.generate_field_key(key=key)
-  value = self._get_default(key, value, REQUEST)
+  value = self._get_default(widget_key, value, REQUEST)
   __traceback_info__ = ('key=%s value=%r' % (key, value))
   return self.widget.render_htmlgrid(self, widget_key, value, REQUEST)
 Field.render_htmlgrid = Field_render_htmlgrid

product/ERP5Form/MultiRelationField.py

@@ -249,22 +249,14 @@ class MultiRelationStringFieldWidget(Widget.LinesTextAreaWidget,
           ####################################
           # Render listfield
           ####################################
-          tales_expr = field.tales.get('items', None)
-          defined_tales = 0
-          if not tales_expr:
-            defined_tales = 1
-            from Products.Formulator.TALESField import TALESMethod
-            # XXX XXX Do not write in the ZODB
-            field.tales['items'] = TALESMethod('REQUEST/relation_item_list')
 
           REQUEST['relation_item_list'] = relation_item_list
           sub_html_string += ' %s ' % \
                                 Widget.ListWidgetInstance.render(
                                 field, relation_field_id, None, REQUEST)
           REQUEST['relation_item_list'] = None
-          if defined_tales:
-            # Delete default tales on the fly
-            field.tales['items'] = None
+
+
         else:
           ####################################
           # Render wheel
@@ -778,3 +770,17 @@ class MultiRelationStringField(ZMIField):
     else:
       result = ZMIField.get_orig_value(self, id)
     return result
+
+  security.declareProtected('Access contents information', 'get_value')
+  def get_value(self, id, REQUEST=None, **kw):
+    """Get value for id.
+
+    Optionally pass keyword arguments that get passed to TALES
+    expression.
+    """
+    if (id == 'items') and (REQUEST is not None):
+      # relation_item_list is not editable for the RelationField
+      result = REQUEST.get('relation_item_list', None)
+    else:
+      result = ZMIField.get_value(self, id, **kw)
+    return result