[Formulator] Pass through correct REQUEST inside fields and forms

product/ERP5Form/EditorField.py

@@ -80,6 +80,8 @@ class EditorWidget(Widget.TextAreaWidget):
     """
       Render editor
     """
+    if REQUEST is None:
+      REQUEST = get_request()
     here = REQUEST['here']
     text_editor = field.get_value('text_editor')
     if text_editor == "svg_editor":

product/ERP5Form/Form.py

@@ -263,7 +263,7 @@ class DefaultValue(StaticValue):
     self.value = value
 
   def __call__(self, field, id, **kw):
-    REQUEST = get_request()
+    REQUEST = kw.get('REQUEST', None) or get_request()
     try:
       form = field.aq_parent
       ob = REQUEST.get('cell', getattr(form, 'aq_parent', None))
@@ -278,7 +278,6 @@ class DefaultValue(StaticValue):
           value = ob.getProperty(self.key)
       except Unauthorized:
         value = ob.getProperty(self.key, d=value, checked_permission='View')
-        REQUEST = kw.get('REQUEST', get_request())
         if REQUEST is not None:
           REQUEST.set('read_only_%s' % self.key, 1)
     except (KeyError, AttributeError):

product/ERP5Form/tests/testListBox.py

@@ -730,6 +730,7 @@ class TestListBox(ERP5TypeTestCase):
     """
     portal = self.getPortal()
     request = get_request()
+    request['here'] = portal.foo_module
     portal.ListBoxZuite_reset()
     form = portal.FooModule_viewFooList
     self.assertEqual(None, request.get('listbox_form_id'))

product/Formulator/Field.py

@@ -111,7 +111,8 @@ class Field:
             # add 'here' if not in kw
             if not kw.has_key('here'):
                 kw['here'] = self.aq_parent
-            kw['request'] = self.REQUEST
+            if not kw.has_key('request'):
+                kw['request'] = self.REQUEST
             value = tales_expr.__of__(self)(
                 field=self,
                 form=self.aq_parent, **kw)