Commit 5ddde15c authored by Nicolas Delaby's avatar Nicolas Delaby

Change code typo

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16578 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e061d918
...@@ -1613,13 +1613,15 @@ class XMLSyncUtils(XMLSyncUtilsMixin): ...@@ -1613,13 +1613,15 @@ class XMLSyncUtils(XMLSyncUtilsMixin):
# Get the subscriber or create it if not already in the list # Get the subscriber or create it if not already in the list
subscriber = publication.getSubscriber(subscription_url) subscriber = publication.getSubscriber(subscription_url)
if subscriber == None: if subscriber == None:
subscriber = Subscriber(publication.generateNewId(),subscription_url) subscriber = Subscriber(publication.generateNewId(), subscription_url)
subscriber.setXMLMapping(publication.getXMLMapping()) subscriber.setXMLMapping(publication.getXMLMapping())
subscriber.setConduit(publication.getConduit()) subscriber.setConduit(publication.getConduit())
publication.addSubscriber(subscriber) publication.addSubscriber(subscriber)
subscriber = subscriber.__of__(publication) subscriber = subscriber.__of__(publication)
# first synchronization # first synchronization
result = self.PubSyncInit(publication,xml_client,subscriber=subscriber, result = self.PubSyncInit(publication=publication,
xml_client=xml_client,
subscriber=subscriber,
sync_type=self.SLOW_SYNC) sync_type=self.SLOW_SYNC)
elif self.checkAlert(xml_client) and \ elif self.checkAlert(xml_client) and \
alert_code in (self.TWO_WAY, self.SLOW_SYNC, \ alert_code in (self.TWO_WAY, self.SLOW_SYNC, \
...@@ -1627,7 +1629,9 @@ class XMLSyncUtils(XMLSyncUtilsMixin): ...@@ -1627,7 +1629,9 @@ class XMLSyncUtils(XMLSyncUtilsMixin):
subscriber.setXMLMapping(publication.getXMLMapping()) subscriber.setXMLMapping(publication.getXMLMapping())
subscriber.setConduit(publication.getConduit()) subscriber.setConduit(publication.getConduit())
result = self.PubSyncInit(publication=publication, result = self.PubSyncInit(publication=publication,
xml_client=xml_client, subscriber=subscriber, sync_type=alert_code) xml_client=xml_client,
subscriber=subscriber,
sync_type=alert_code)
else: else:
#we log the user authenticated to do the synchronization with him #we log the user authenticated to do the synchronization with him
if self.checkMap(xml_client) : if self.checkMap(xml_client) :
...@@ -1642,9 +1646,10 @@ class XMLSyncUtils(XMLSyncUtilsMixin): ...@@ -1642,9 +1646,10 @@ class XMLSyncUtils(XMLSyncUtilsMixin):
elif subscriber is not None: elif subscriber is not None:
# This looks like we are starting a synchronization after # This looks like we are starting a synchronization after
# a conflict resolution by the user # a conflict resolution by the user
result = self.PubSyncInit(publication=publication, xml_client=None, result = self.PubSyncInit(publication=publication,
subscriber=subscriber, sync_type=self.TWO_WAY) xml_client=None,
subscriber=subscriber,
sync_type=self.TWO_WAY)
if RESPONSE is not None: if RESPONSE is not None:
RESPONSE.redirect('managePublications') RESPONSE.redirect('managePublications')
elif result is not None: elif result is not 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