Commit 2502b134 authored by Aurel's avatar Aurel

fix call to store in return value of undo


git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@197 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 485ddf33
......@@ -662,10 +662,11 @@ class Application(object):
data_dict[oid] = data
# Third do transaction with old data
for oid in data_dict.keys():
oid_list = data_dict.keys()
for oid in oid_list:
data = data_dict[oid]
try:
self.store(oid, self.tid, data, None, txn)
self.store(oid, transaction_id, data, None, txn)
except NEOStorageConflictError, serial:
if serial <= self.tid:
new_data = wrapper.tryToResolveConflict(oid, self.tid,
......@@ -675,7 +676,7 @@ class Application(object):
continue
raise ConflictError(oid = oid, serials = (self.tid, serial),
data = data)
return self.tid, oid_list
def undoLog(self, first, last, filter=None, block=0):
if last < 0:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment