diff --git a/bt5/erp5_safeimage/ExtensionTemplateItem/portal_components/extension.erp5.ERP5ZoomifyImage.py b/bt5/erp5_safeimage/ExtensionTemplateItem/portal_components/extension.erp5.ERP5ZoomifyImage.py index ecf6fcfbc4641ddc8d87f74c7212e2d909d20b4e..37e849a7c5ac136ffdd759fbde02484eeb91ec2c 100644 --- a/bt5/erp5_safeimage/ExtensionTemplateItem/portal_components/extension.erp5.ERP5ZoomifyImage.py +++ b/bt5/erp5_safeimage/ExtensionTemplateItem/portal_components/extension.erp5.ERP5ZoomifyImage.py @@ -463,7 +463,7 @@ class ZoomifyZopeProcessor(ZoomifyBase): #import Zope #app = Zope.app() - #get_transaction().begin() + #transaction.manager.begin() self._process() #app._p_jar.close() #del app diff --git a/product/ERP5/Document/Coordinate.py b/product/ERP5/Document/Coordinate.py index 208d48a7e61293abbbb21f11dcf0450b986458cb..74c6fded23323f0c03ee3be66579eb0455cf8382 100644 --- a/product/ERP5/Document/Coordinate.py +++ b/product/ERP5/Document/Coordinate.py @@ -230,7 +230,8 @@ class Coordinate(Base): RESPONSE.setStatus(204) return RESPONSE except ResourceLockedError: - get_transaction().abort() + import transaction + transaction.abort() RESPONSE.setStatus(423) return RESPONSE diff --git a/product/ERP5/Extensions/ClearData.py b/product/ERP5/Extensions/ClearData.py index a75282270a38aba3984be15eddf0226596b8e3d7..2aa753a98485dcbe0cca16b887eae47db6221507 100644 --- a/product/ERP5/Extensions/ClearData.py +++ b/product/ERP5/Extensions/ClearData.py @@ -2,6 +2,7 @@ def clearData(self,REQUEST=None): """ this allows to erase every data object """ + import transaction context=self for folder in context.objectValues(("ERP5 Folder",)): print "#### Deleting inside the folder %s ####" % folder.id @@ -11,6 +12,6 @@ def clearData(self,REQUEST=None): for id in to_delete_list: folder.manage_delObjects(id) to_delete_list = folder.objectIds() - get_transaction().commit() + transaction.commit() print "work done" diff --git a/product/ERP5/tests/testTask.py b/product/ERP5/tests/testTask.py index 2e9047fd375c7afe5a5ee602427228099dde84cd..9ac410a34cb1362d04bd45a7fe3d38323fcfb1b8 100644 --- a/product/ERP5/tests/testTask.py +++ b/product/ERP5/tests/testTask.py @@ -128,6 +128,7 @@ class TestTaskMixin: # portal = self.getPortal() # uf = portal.acl_users # if not uf.getUserById('dummy'): +# import transaction # uf._doAddUser('manager', '', ['Manager'], []) # self.loginByUserName('manager') # person_module = portal.getDefaultModule(self.person_portal_type) @@ -141,7 +142,7 @@ class TestTaskMixin: # start_date='1980-01-01', # stop_date='2099-12-31') # assignment.open() -# get_transaction().commit() +# transaction.commit() # self.tic() # module_list = [] # portal_type_list = [] @@ -164,7 +165,7 @@ class TestTaskMixin: # '') # ti.updateRoleMapping() # -# get_transaction().commit() +# transaction.commit() # self.tic() # portal.portal_caches.clearAllCache() # diff --git a/product/ZLDAPConnection/Entry.py b/product/ZLDAPConnection/Entry.py index 684bc57919f88abd3c03b0235e43203a99e2cc9f..185f63dd4d67dc5623b2a65abe6561f3d4c95392 100644 --- a/product/ZLDAPConnection/Entry.py +++ b/product/ZLDAPConnection/Entry.py @@ -6,6 +6,7 @@ LDAP Entry Objects __version__ = "$Revision: 1.13 $"[11:-2] import Acquisition, AccessControl, OFS, string +import transaction from App.special_dtml import HTMLFile from App.Dialogs import MessageDialog import ldap, urllib, UserList @@ -296,7 +297,7 @@ class TransactionalEntry(GenericEntry): #Acquisition.Implicit self._data={} self._isNew=isNew if isNew: - get_transaction().register(self) + transaction.get().register(self) self._registered=1 self._isDeleted=0 #deletion flag self._clearSubentries() @@ -312,7 +313,7 @@ class TransactionalEntry(GenericEntry): #Acquisition.Implicit is called. """ if not self._registered: - get_transaction().register(self) + transaction.get().register(self) self._registered=1 kwdict.update(kw) @@ -330,7 +331,7 @@ class TransactionalEntry(GenericEntry): #Acquisition.Implicit Unset (delete) an attribute """ if not self._registered: - get_transaction().register(self) + transaction.get().register(self) self._registered=1 if type(attr) is type(''): @@ -371,7 +372,7 @@ class TransactionalEntry(GenericEntry): #Acquisition.Implicit c._registerDelete(o.dn) o._isDeleted=1 if not o._registered: - get_transaction().register(o) + transaction.get().register(o) o._registered=1 del self._subentries()[o.id]