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

[nobody at svn.erp5.org]

Author: yo
Date: Mon Oct 15 20:34:53 2007
New Revision: 17012

URL: http://svn.erp5.org?rev=17012&view=rev
Log:
The previous way was overkill.

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=17012&r1=17011&r2=17012&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/Form.py (original)
+++ erp5/trunk/products/ERP5Form/Form.py Mon Oct 15 20:34:53 2007
@@ -257,17 +257,20 @@
   if self._p_oid is None:
     return self._original_get_value(id, **kw)
 
-  cache_id = ('Form.get_value',
-              self._p_oid,
-              field._p_oid,
-              id)
-
-  try:
-    value = _field_value_cache[cache_id]
-  except KeyError:
-    # either returns non callable value (ex. "Title")
-    # or a FieldValue instance of appropriate class
-    value = _field_value_cache[cache_id] = getFieldValue(self, field, id, **kw)
+  if 1:
+    value = getFieldValue(self, field, id, **kw)
+  else:
+    cache_id = ('Form.get_value',
+                self._p_oid,
+                field._p_oid,
+                id)
+
+    try:
+      value = _field_value_cache[cache_id]
+    except KeyError:
+      # either returns non callable value (ex. "Title")
+      # or a FieldValue instance of appropriate class
+      value = _field_value_cache[cache_id] = getFieldValue(self, field, id, **kw)
 
   if callable(value):
     return value(field, id, **kw)
@@ -304,7 +307,7 @@
 
 # Dynamic Patch
 original_get_value = Field.get_value
-# Field.get_value = get_value
+Field.get_value = get_value
 Field._original_get_value = original_get_value
 Field._get_default = _get_default
 Field.om_icons = om_icons