[Erp5-report] r12573 - in /erp5/trunk/products/ERP5Form: Form.py ProxyField.py

[nobody at svn.erp5.org]

Author: romain
Date: Wed Feb  7 16:27:39 2007
New Revision: 12573

URL: http://svn.erp5.org?rev=12573&view=rev
Log:
Remove deprecated extra_context parameter on ProxyField.

Modified:
    erp5/trunk/products/ERP5Form/Form.py
    erp5/trunk/products/ERP5Form/ProxyField.py

Modified: erp5/trunk/products/ERP5Form/Form.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/Form.py?rev=12573&r1=12572&r2=12573&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/Form.py (original)
+++ erp5/trunk/products/ERP5Form/Form.py Wed Feb  7 16:27:39 2007
@@ -78,9 +78,6 @@
         except AttributeError :
             LOG('ERP5Form', 0,
               'portal_preferences not put in TALES context (not installed?)')
-        extra_context = REQUEST.other.get('erp5_extra_context', None)
-        if extra_context:
-          kw.update(extra_context)
         # This allows to pass some pointer to the local object
         # through the REQUEST parameter. Not very clean.
         # Used by ListBox to render different items in a list

Modified: erp5/trunk/products/ERP5Form/ProxyField.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/ProxyField.py?rev=12573&r1=12572&r2=12573&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/ProxyField.py (original)
+++ erp5/trunk/products/ERP5Form/ProxyField.py Wed Feb  7 16:27:39 2007
@@ -60,7 +60,6 @@
     'form_id',
     'field_id',
     'target',
-    'extra_context',
   ]
 
   form_id = fields.StringField(
@@ -79,15 +78,6 @@
                                 default="",
                                 required=1)
 
-  # XXX FIXME This seems against the definition of proxy field...
-  # Remove it as soon as possible
-  extra_context = fields.ListTextAreaField(
-                                'extra_context', 
-                                title='Extra Context (deprecated)', 
-                                description='Additional context variables.',
-                                default=(), 
-                                required=0)
-
   target = fields.HyperLinkField(
                                 'target',
                                 title='Proxy Target',
@@ -103,7 +93,6 @@
     result = ''
     proxy_field = field.getRecursiveTemplateField()
     if proxy_field is not None:
-      REQUEST = field.updateContext(REQUEST)
       result = proxy_field.widget.render(field, key, value, REQUEST)
     return result
 
@@ -114,7 +103,6 @@
     result = ''
     proxy_field = field.getRecursiveTemplateField()
     if proxy_field is not None:
-      REQUEST = field.updateContext(REQUEST)
       result = proxy_field.widget.render_htmlgrid(field, key, value, REQUEST)
     return result
 
@@ -136,7 +124,6 @@
 
   def validate(self, field, key, REQUEST):
     proxy_field = field.getTemplateField()
-    REQUEST = field.updateContext(REQUEST)
     try:
       result = proxy_field.validator.validate(field, key, REQUEST)
     except ValidationError, error:
@@ -432,15 +419,6 @@
       else:
         return ZMIField.get_error_message(self, name)
 
-  def updateContext(self, REQUEST):
-    """
-    Update the REQUEST
-    """
-    extra_context = REQUEST.other.get('erp5_extra_context', {})
-    for k, v in self.get_value('extra_context'):
-      extra_context[k] = v
-    REQUEST.other['erp5_extra_context'] = extra_context
-    return REQUEST
 
   security.declareProtected('Edit target', 'manage_edit_target')
   def manage_edit_target(self, REQUEST):