* fix the condition to make cache working.

* a small optimisation.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@23756 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Form/ProxyField.py

@@ -441,11 +441,12 @@ class ProxyField(ZMIField):
       template_field = field.getTemplateField()
       if template_field.__class__ != ProxyField:
         break
-      if aq_base(template_field) in chain:
+      template_field_base = aq_base(template_field)
+      if template_field_base in chain:
         LOG('ProxyField', WARNING, 'Infinite loop detected in %s.' %
             '/'.join(self.getPhysicalPath()))
         return
-      chain.append(aq_base(template_field))
+      chain.append(template_field_base)
       field = template_field
     return template_field
 
@@ -691,9 +692,11 @@ class ProxyField(ZMIField):
     getTransactionalVariable(self)[self._getCacheId()] = field
 
   def _getTemplateFieldCache(self):
-    if self.aq_parent:
+    parent = self.aq_parent
+    if parent is not None:
+      return getTransactionalVariable(self)[self._getCacheId()].__of__(parent)
+    else:
       raise KeyError
-    return getTransactionalVariable(self)[self._getCacheId()].__of__(self.aq_parent)
 
 
 #