[Erp5-report] r11658 - /erp5/trunk/products/ERP5Form/

[nobody at svn.erp5.org]

Author: romain
Date: Fri Dec  8 14:25:24 2006
New Revision: 11658

URL: http://svn.erp5.org?rev=11658&view=rev
Log:
Fix compatibility between ProxyField and RelationField.
Remove a possible conflict error (do not write in the ZODB if it's useless).

Modified:
    erp5/trunk/products/ERP5Form/FormulatorPatch.py
    erp5/trunk/products/ERP5Form/MultiRelationField.py

Modified: erp5/trunk/products/ERP5Form/FormulatorPatch.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/FormulatorPatch.py?rev=11658&r1=11657&r2=11658&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/FormulatorPatch.py (original)
+++ erp5/trunk/products/ERP5Form/FormulatorPatch.py Fri Dec  8 14:25:24 2006
@@ -1108,7 +1108,7 @@
   """
   # 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

Modified: erp5/trunk/products/ERP5Form/MultiRelationField.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/MultiRelationField.py?rev=11658&r1=11657&r2=11658&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/MultiRelationField.py (original)
+++ erp5/trunk/products/ERP5Form/MultiRelationField.py Fri Dec  8 14:25:24 2006
@@ -249,22 +249,14 @@
           ####################################
           # 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 @@
     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