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

[nobody at svn.erp5.org]

Author: jp
Date: Sat Mar 24 12:04:52 2007
New Revision: 13606

URL: http://svn.erp5.org?rev=13606&view=rev
Log:
Provide a chance to accessors to return default value whenever no default value is defined on the field.

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=13606&r1=13605&r2=13606&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/Form.py (original)
+++ erp5/trunk/products/ERP5Form/Form.py Sat Mar 24 12:04:52 2007
@@ -120,7 +120,13 @@
                 form = self.aq_parent
                 ob = getattr(form, 'aq_parent', None)
                 key = self.id[3:]
-                value = ob.getProperty(key, d=value)
+                if value not in (None, ''):
+                  # If a default value is defined on the field, it has precedence
+                  value = ob.getProperty(key, d=value)
+                else:
+                  # else we should give a chance to the accessor to provide
+                  # a default value (including None)
+                  value = ob.getProperty(key)
               except (KeyError, AttributeError):
                 value = None
             # For the 'editable' value, we try to get a default value