[Erp5-report] r8468 - /erp5/trunk/products/ERP5Form/Form.py

[nobody at svn.erp5.org]

Author: kevin
Date: Tue Jul 18 13:08:58 2006
New Revision: 8468

URL: http://svn.erp5.org?rev=8468&view=rev
Log:
Make "cell" attribute working in tales expression of editable widget within listbox

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

Modified: erp5/trunk/products/ERP5Form/Form.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/Form.py?rev=8468&r1=8467&r2=8468&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/Form.py (original)
+++ erp5/trunk/products/ERP5Form/Form.py Tue Jul 18 13:08:58 2006
@@ -59,7 +59,7 @@
     tales_expr = self.tales.get(id, "")
     if tales_expr:
         REQUEST = get_request()
-        form = self.aq_parent
+        form = self.aq_parent # XXX (JPS) form for default is wrong apparently in listbox - double check
         object = getattr(form, 'aq_parent', None)
         if object:
             # NEEDS TO BE CHECKED
@@ -90,6 +90,9 @@
             kw['cell'] = getattr(kw['REQUEST'],'cell')
           else:
             kw['cell'] = kw['REQUEST']
+        elif not kw.get('cell'):
+          if getattr(REQUEST,'cell',None) is not None:
+            kw['cell'] = getattr(REQUEST,'cell')
         try:
             value = tales_expr.__of__(self)(**kw)
         except (ConflictError, RuntimeError):
@@ -343,7 +346,7 @@
     # Special Settings
     settings_form = create_settings_form()
 
-    def __init__(self, id, title, unicode_mode=0, encoding='UTF-8', 
+    def __init__(self, id, title, unicode_mode=0, encoding='UTF-8',
                  stored_encoding='UTF-8'):
         """Initialize form.
         id    -- id of form
@@ -372,7 +375,7 @@
         extra_context['form'] = self
         extra_context['container'] = container ## PROBLEM NOT TAKEN INTO ACCOUNT
         extra_context['here'] = object
-        # We initialize here an index which is used to generate 
+        # We initialize here an index which is used to generate
         # different method ids for every field
         request = extra_context['request']
         # XXX We must not use a counter, but a ID for each field