Commit ee6d2005 authored by Sebastien Robin's avatar Sebastien Robin

small update in order to always force some updates


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@485 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 6f254af1
...@@ -364,7 +364,8 @@ class ERP5Conduit(XMLSyncUtilsMixin): ...@@ -364,7 +364,8 @@ class ERP5Conduit(XMLSyncUtilsMixin):
LOG('updateNode',0,'Conflict data: %s' % str(data)) LOG('updateNode',0,'Conflict data: %s' % str(data))
LOG('updateNode',0,'Conflict old_data: %s' % str(old_data)) LOG('updateNode',0,'Conflict old_data: %s' % str(old_data))
LOG('updateNode',0,'Conflict current_data: %s' % str(current_data)) LOG('updateNode',0,'Conflict current_data: %s' % str(current_data))
if (old_data != current_data) and (data != current_data): if (old_data != current_data) and (data != current_data) \
and keyword not in self.force_conflict_list:
LOG('updateNode',0,'Conflict on : %s' % keyword) LOG('updateNode',0,'Conflict on : %s' % keyword)
# Hack in order to get the synchronization working for demo # Hack in order to get the synchronization working for demo
# XXX this have to be removed after # XXX this have to be removed after
......
...@@ -83,6 +83,7 @@ class SyncCode(Persistent): ...@@ -83,6 +83,7 @@ class SyncCode(Persistent):
tuple(XUPDATE_UPDATE) + tuple(XUPDATE_DEL) tuple(XUPDATE_UPDATE) + tuple(XUPDATE_DEL)
text_type_list = ('text','string') text_type_list = ('text','string')
list_type_list = list_types list_type_list = list_types
force_conflict_list = ('layout_and_schema','ModificationDate')
binary_type_list = ('image','file','document','pickle') binary_type_list = ('image','file','document','pickle')
date_type_list = ('date',) date_type_list = ('date',)
dict_type_list = ('dict',) dict_type_list = ('dict',)
......
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