Commit e23d2be3 authored by Sebastien Robin's avatar Sebastien Robin

we can add a property to objects so that there are not syncrhonized


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@1280 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 3c1b598e
...@@ -824,11 +824,8 @@ class Subscription(Folder, SyncCode): ...@@ -824,11 +824,8 @@ class Subscription(Folder, SyncCode):
query_list = query_method() query_list = query_method()
if callable(query): if callable(query):
query_list = query(destination) query_list = query(destination)
return filter(lambda x: x.id.find('conflict_copy')<0,query_list) query_list = filter(lambda x: x.id.find('conflict_copy')<0,query_list)
return filter(lambda x: getattr(x,'_conflict_resolution',None)==None,query_list)
# if query is not None:
# query_list = query()
# return query_list
def generateNewIdWithGenerator(self, object=None,gid=None): def generateNewIdWithGenerator(self, object=None,gid=None):
""" """
......
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