[Erp5-report] r15179 - in /erp5/trunk/products/ERP5SyncML: ./ dtml/

[nobody at svn.erp5.org]

Author: seb
Date: Tue Jul 10 10:49:22 2007
New Revision: 15179

URL: http://svn.erp5.org?rev=15179&view=rev
Log:
- fix namming in dtml
- misplaced removeRemainingObjectPath in XMLSyncUtils
(by fabien)

Modified:
    erp5/trunk/products/ERP5SyncML/XMLSyncUtils.py
    erp5/trunk/products/ERP5SyncML/dtml/managePublications.dtml
    erp5/trunk/products/ERP5SyncML/dtml/manage_addPublication.dtml

Modified: erp5/trunk/products/ERP5SyncML/XMLSyncUtils.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5SyncML/XMLSyncUtils.py?rev=15179&r1=15178&r2=15179&view=diff
==============================================================================
--- erp5/trunk/products/ERP5SyncML/XMLSyncUtils.py (original)
+++ erp5/trunk/products/ERP5SyncML/XMLSyncUtils.py Tue Jul 10 10:49:22 2007
@@ -699,7 +699,6 @@
       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 @@
             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 @@
             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

Modified: erp5/trunk/products/ERP5SyncML/dtml/managePublications.dtml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5SyncML/dtml/managePublications.dtml?rev=15179&r1=15178&r2=15179&view=diff
==============================================================================
--- erp5/trunk/products/ERP5SyncML/dtml/managePublications.dtml (original)
+++ erp5/trunk/products/ERP5SyncML/dtml/managePublications.dtml Tue Jul 10 10:49:22 2007
@@ -171,7 +171,7 @@
       <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 @@
       <tr>
         <td align="left" valign="top">
         <div class="form-label">
-        Type authentication
+        Authentication Type
         </label></div>
         </td>
         <td align="left" valign="top">

Modified: erp5/trunk/products/ERP5SyncML/dtml/manage_addPublication.dtml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5SyncML/dtml/manage_addPublication.dtml?rev=15179&r1=15178&r2=15179&view=diff
==============================================================================
--- erp5/trunk/products/ERP5SyncML/dtml/manage_addPublication.dtml (original)
+++ erp5/trunk/products/ERP5SyncML/dtml/manage_addPublication.dtml Tue Jul 10 10:49:22 2007
@@ -167,7 +167,7 @@
   <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 @@
   </tr>
     <td align="left" valign="top">
     <div class="form-label">
-    Type authentication
+    Authentication Type
     </label></div>
     </td>
     <td align="left" valign="top">