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

[nobody at svn.erp5.org]

Author: yo
Date: Fri Jun 30 14:02:50 2006
New Revision: 8245

URL: http://svn.erp5.org?rev=8245&view=rev
Log:
Change the way of getting a value again. First, try getProperty, and use getattr only if getProperty does not find anything.

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=8245&r1=8244&r2=8245&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/ListBox.py (original)
+++ erp5/trunk/products/ERP5Form/ListBox.py Fri Jun 30 14:02:50 2006
@@ -1786,15 +1786,14 @@
               except ValueError:
                 property_id = sql
 
-              original_value = getattr(obj, property_id, None)
-              processed_value = original_value
-              if not callable(original_value):
-                try:
-                  original_value = obj.getProperty(property_id)
-                  processed_value = original_value
-                except AttributeError:
-                  original_value = getattr(obj, property_id)
-                  processed_value = original_value
+              try:
+                original_value = obj.getProperty(property_id, _marker)
+                if original_value is _marker:
+                  raise AttributeError, property_id
+                processed_value = original_value
+              except AttributeError:
+                original_value = getattr(obj, property_id, None)
+                processed_value = original_value
             except (AttributeError, KeyError):
               original_value = None
               processed_value = 'Could not evaluate %s' % property_id