[Erp5-report] r42859 nicolas.dumazet - in /erp5/trunk/products/ERP5Type: ./ Tool/ tests/

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Tue Feb  1 03:45:47 2011
New Revision: 42859

URL: http://svn.erp5.org?rev=42859&view=rev
Log:
replace _aq_reset calls/resetDynamicDocuments calls with resetDynamicDocumentsOnceAtTransactionBoundary calls

Modified:
    erp5/trunk/products/ERP5Type/Tool/ClassTool.py
    erp5/trunk/products/ERP5Type/TranslationProviderBase.py
    erp5/trunk/products/ERP5Type/tests/testERP5Type.py

Modified: erp5/trunk/products/ERP5Type/Tool/ClassTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Tool/ClassTool.py?rev=42859&r1=42858&r2=42859&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Tool/ClassTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Tool/ClassTool.py [utf8] Tue Feb  1 03:45:47 2011
@@ -61,7 +61,6 @@ from Products.ERP5Type.Utils import read
 from Products.ERP5Type.Utils import readLocalConstraint, writeLocalConstraint, getLocalConstraintList
 from Products.ERP5Type.InitGenerator import getProductDocumentPathList
 
-from Products.ERP5Type.Base import _aq_reset
 from Products.ERP5Type.Base import newTempDocumentationHelper
 
 from Products.ERP5Type import allowClassTool
@@ -222,7 +221,7 @@ if allowClassTool():
     def reimport(self, status, class_id):
       if status and self.__importer is not None:
         self.__importer(class_id)
-        _aq_reset()
+        self.portal_types.resetDynamicDocumentsOnceAtTransactionBoundary()
       
     def _getOb(self, key, default=_MARKER ):
       if key in self.objectIds():
@@ -550,7 +549,7 @@ class %s(XMLObject):
 
         # Clear object cache and reset _aq_dynamic after reload
         self._clearCache()
-        _aq_reset()
+        self.portal_types.resetDynamicDocumentsOnceAtTransactionBoundary()
 
         if REQUEST is not None and class_path is None:
           REQUEST.RESPONSE.redirect('%s/manage_editDocumentForm?class_id=%s&manage_tabs_message=Document+Reloaded+Successfully' % (self.absolute_url(), class_id))
@@ -661,7 +660,7 @@ class %s:
         # Reset _aq_dynamic after reload
         # There is no need to reset the cache in this case because
         # XXX it is not sure however that class defined propertysheets will be updated
-        _aq_reset()
+        self.portal_types.resetDynamicDocumentsOnceAtTransactionBoundary()
         if REQUEST is not None:
           REQUEST.RESPONSE.redirect('%s/manage_editPropertySheetForm?class_id=%s&manage_tabs_message=PropertySheet+Reloaded+Successfully' % (self.absolute_url(), class_id))
 
@@ -928,7 +927,7 @@ class %s(Constraint):
         # Reset _aq_dynamic after reload
         # There is no need to reset the cache in this case because
         # XXX it is not sure however that class defined propertysheets will be updated
-        _aq_reset()
+        self.portal_types.resetDynamicDocumentsOnceAtTransactionBoundary()
         if REQUEST is not None:
           REQUEST.RESPONSE.redirect('%s/manage_editConstraintForm?class_id=%s&manage_tabs_message=Constraint+Reloaded+Successfully' % (self.absolute_url(), class_id))
 

Modified: erp5/trunk/products/ERP5Type/TranslationProviderBase.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/TranslationProviderBase.py?rev=42859&r1=42858&r2=42859&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/TranslationProviderBase.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/TranslationProviderBase.py [utf8] Tue Feb  1 03:45:47 2011
@@ -155,8 +155,9 @@ class TranslationProviderBase(object):
       if new_domain_name != prop_object.getDomainName():
         prop_object.edit(domain_name=new_domain_name)
 
-    from Products.ERP5Type.Base import _aq_reset
-    _aq_reset() # Reset accessor cache
+    # Reset accessor cache
+    types_tool = self.getPortalObject().portal_types
+    types_tool.resetDynamicDocumentsOnceAtTransactionBoundary()
 
     if REQUEST is not None:
       return self.manage_editTranslationForm(REQUEST, manage_tabs_message=

Modified: erp5/trunk/products/ERP5Type/tests/testERP5Type.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/testERP5Type.py?rev=42859&r1=42858&r2=42859&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/testERP5Type.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/testERP5Type.py [utf8] Tue Feb  1 03:45:47 2011
@@ -76,8 +76,11 @@ class PropertySheetTestCase(ERP5TypeTest
         if psheet in property_sheet_set:
           property_sheet_set.remove(psheet)
       ti._setTypePropertySheetList(list(property_sheet_set))
+    # this is useful if somehow the interaction workflows is set
+    # wrongly. If the interaction has been called already it does nothing,
+    # but in the other hand, if isolates the test "just in case"
+    ttool.resetDynamicDocumentsOnceAtTransactionBoundary()
     transaction.commit()
-    ttool.resetDynamicDocuments()
     super(PropertySheetTestCase, self).tearDown()
 
   def _addProperty(self, portal_type_name, property_sheet_id, property_id, **kw):