Commit 9ab95b31 authored by Nicolas Delaby's avatar Nicolas Delaby

Do not reset workflow and local roles by default when adding new object, typo

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16404 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 7538b2ca
...@@ -128,8 +128,8 @@ class ERP5Conduit(XMLSyncUtilsMixin): ...@@ -128,8 +128,8 @@ class ERP5Conduit(XMLSyncUtilsMixin):
[conflict1,conflict2,...] where conclict1 is of the form : [conflict1,conflict2,...] where conclict1 is of the form :
[object.getPath(),keyword,local_and_actual_value,subscriber_value] [object.getPath(),keyword,local_and_actual_value,subscriber_value]
""" """
reset_local_roles = 1 reset_local_roles = 0
reset_workflow = 1 reset_workflow = 0
conflict_list = [] conflict_list = []
xml = self.convertToXml(xml) xml = self.convertToXml(xml)
if xml is None: if xml is None:
...@@ -279,8 +279,11 @@ class ERP5Conduit(XMLSyncUtilsMixin): ...@@ -279,8 +279,11 @@ class ERP5Conduit(XMLSyncUtilsMixin):
#LOG('ERP5Conduit.updateNode, force: ', DEBUG, force) #LOG('ERP5Conduit.updateNode, force: ', DEBUG, force)
# we have an xupdate xml # we have an xupdate xml
if xml.nodeName == 'xupdate:modifications': if xml.nodeName == 'xupdate:modifications':
conflict_list += self.applyXupdate(object=object, xupdate=xml, conflict_list += self.applyXupdate(object=object,
conduit=self,previous_xml=previous_xml, force=force, xupdate=xml,
conduit=self,
previous_xml=previous_xml,
force=force,
simulate=simulate, **kw) simulate=simulate, **kw)
# we may have only the part of an xupdate # we may have only the part of an xupdate
else: else:
...@@ -380,8 +383,11 @@ class ERP5Conduit(XMLSyncUtilsMixin): ...@@ -380,8 +383,11 @@ class ERP5Conduit(XMLSyncUtilsMixin):
if keyword == 'object': if keyword == 'object':
# This is the case where we have to call addNode # This is the case where we have to call addNode
conflict_list += self.addNode(xml=xml, object=object, force=force, conflict_list += self.addNode(xml=xml,
simulate=simulate, **kw)['conflict_list'] object=object,
force=force,
simulate=simulate,
**kw)['conflict_list']
elif keyword == self.history_tag and not simulate: elif keyword == self.history_tag and not simulate:
# This is the case where we have to call addNode # This is the case where we have to call addNode
conflict_list += self.addNode(xml=subnode,object=object,force=force, conflict_list += self.addNode(xml=subnode,object=object,force=force,
......
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