diff --git a/product/ERP5SyncML/XMLSyncUtils.py b/product/ERP5SyncML/XMLSyncUtils.py index 5d78dd624a3c96e5ebcae51bbd0b9decf913112e..65789e7e3a69ef48ff69e3564ce7cd58c75ba680 100644 --- a/product/ERP5SyncML/XMLSyncUtils.py +++ b/product/ERP5SyncML/XMLSyncUtils.py @@ -699,7 +699,6 @@ class XMLSyncUtilsMixin(SyncCode): object_path_list = map(lambda x: x.getPhysicalPath(),object_list) subscriber.setRemainingObjectPathList(object_path_list) - #object_gid = domain.getGidFromObject(object) local_gid_list = map(lambda x: domain.getGidFromObject(x),object_list) # Objects to remove #LOG('remove object to remove ...',0,'') @@ -779,9 +778,6 @@ class XMLSyncUtilsMixin(SyncCode): status = self.PARTIAL signature.setAction('Add') xml_string = '<!--' + short_string + '-->' - else:#if there is no partial data, - #we could remove the object from the remain list - subscriber.removeRemainingObjectPath(object_path) gid = signature.getRid()#in fisrt, we try with rid if there is one if gid == None: gid = signature.getGid() @@ -895,6 +891,8 @@ class XMLSyncUtilsMixin(SyncCode): syncml_data += self.addXMLObject(cmd_id=cmd_id, object=object, gid=gid, xml_string=xml_string, more_data=more_data, media_type=subscriber.getMediaType()) + if not more_data: + subscriber.removeRemainingObjectPath(object_path) else: result['finished'] = 1 break diff --git a/product/ERP5SyncML/dtml/managePublications.dtml b/product/ERP5SyncML/dtml/managePublications.dtml index 53b79f71d7ec69bdfbb5aaea3254f15d27eb99ca..104693b0cae3dd9b81ab7073523cb6637b478c96 100644 --- a/product/ERP5SyncML/dtml/managePublications.dtml +++ b/product/ERP5SyncML/dtml/managePublications.dtml @@ -171,7 +171,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. <tr> <td align="left" valign="top"> <div class="form-label"> - Format authentication + Authentication Format </label></div> </td> <td align="left" valign="top"> @@ -181,7 +181,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. <tr> <td align="left" valign="top"> <div class="form-label"> - Type authentication + Authentication Type </label></div> </td> <td align="left" valign="top"> diff --git a/product/ERP5SyncML/dtml/manage_addPublication.dtml b/product/ERP5SyncML/dtml/manage_addPublication.dtml index 710f1430a943341679053432745b56a2241ff321..57fb9729300503465f063ac02d88ff608f109e5f 100644 --- a/product/ERP5SyncML/dtml/manage_addPublication.dtml +++ b/product/ERP5SyncML/dtml/manage_addPublication.dtml @@ -167,7 +167,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. <tr> <td align="left" valign="top"> <div class="form-label"> - Format authentication + Authentication Format </label></div> </td> <td align="left" valign="top"> @@ -176,7 +176,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. </tr> <td align="left" valign="top"> <div class="form-label"> - Type authentication + Authentication Type </label></div> </td> <td align="left" valign="top">