[Erp5-report] r33304 yo - /erp5/trunk/products/ERP5Form/ListBox.py

[nobody at svn.erp5.org]

Author: yo
Date: Wed Mar  3 09:02:35 2010
New Revision: 33304

URL: http://svn.erp5.org?rev=33304&view=rev
Log:
Use get_recursive_tales (for ProxyField) or get_tales (for the others) to see if a tales expression is defined. Otherwise, a delegated one is ignored.

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

Modified: erp5/trunk/products/ERP5Form/ListBox.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/ListBox.py?rev=33304&r1=33303&r2=33304&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/ListBox.py [utf8] (original)
+++ erp5/trunk/products/ERP5Form/ListBox.py [utf8] Wed Mar  3 09:02:35 2010
@@ -2113,7 +2113,13 @@
         editable_field = renderer.getEditableField(alias)
         tales = False
         if editable_field is not None:
-          tales = editable_field.tales.get('default', '')
+          # XXX we need to take care of whether the editable field is
+          # a proxy field or not, because a proxy field may inherit a
+          # tales expression from a template field, and the API is not
+          # unified.
+          get_tales = getattr(editable_field, 'get_recursive_tales',
+                              editable_field.get_tales)
+          tales = get_tales('default')
           if tales:
             obj = self.getObject()
             original_value = editable_field.__of__(obj).get_value('default',
@@ -2703,7 +2709,6 @@
                   my_field = form.get_field(my_field_id)
                   REQUEST.set('cell', o) # We need cell
                   if my_field.get_value('editable', REQUEST=REQUEST) and field.need_validate(REQUEST):
-                    tales_expr = my_field.tales.get('default', "")
                     error_result_key = '%s_%s' % (my_field.id, o.uid)
                     key = 'field_' + error_result_key
                     try: