some renaming were not done yet

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@475 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5SyncML/SynchronizationTool.py

@@ -304,7 +304,7 @@ class SynchronizationTool( UniqueObject, SimpleItem,
     Retrieve the list of all conflicts
     Here the list is as follow :
     [conflict_1,conflict2,...] where conflict_1 is like:
-    ['publication',publication_id,object.getPath(),keyword,publisher_value,subscriber_value]
+    ['publication',publication_id,object.getPath(),property_id,publisher_value,subscriber_value]
     """
     path = self.resolveContext(context)
     conflict_list = []
@@ -451,7 +451,7 @@ class SynchronizationTool( UniqueObject, SimpleItem,
 
 
   security.declareProtected(Permissions.ModifyPortalContent, 'manageLocalValue')
-  def manageLocalValue(self, subscription_url, keyword, object_path, RESPONSE=None):
+  def managePublisherValue(self, subscription_url, property_id, object_path, RESPONSE=None):
     """
     Do whatever needed in order to store the local value on
     the remote server
@@ -469,12 +469,12 @@ class SynchronizationTool( UniqueObject, SimpleItem,
     """
     # Retrieve the conflict object
     LOG('manageLocalValue',0,'%s %s %s' % (str(subscription_url),
-                                           str(keyword),
+                                           str(property_id),
                                            str(object_path)))
     for conflict in self.getConflictList():
       LOG('manageLocalValue, conflict:',0,conflict)
-      if conflict.getKeyword() == keyword:
-        LOG('manageLocalValue',0,'found the keyword')
+      if conflict.getPropertyId() == property_id:
+        LOG('manageLocalValue',0,'found the property_id')
         if '/'.join(conflict.getObjectPath())==object_path:
           if conflict.getSubscriber().getSubscriptionUrl()==subscription_url:
             conflict.applyPublisherValue()
@@ -482,18 +482,18 @@ class SynchronizationTool( UniqueObject, SimpleItem,
       RESPONSE.redirect('manageConflicts')
 
   security.declareProtected(Permissions.ModifyPortalContent, 'manageRemoteValue')
-  def manageRemoteValue(self, subscription_url, keyword, object_path, RESPONSE=None):
+  def manageSubscriberValue(self, subscription_url, property_id, object_path, RESPONSE=None):
     """
     Do whatever needed in order to store the remote value locally
     and confirmed that the remote box should keep it's value
     """
     LOG('manageLocalValue',0,'%s %s %s' % (str(subscription_url),
-                                           str(keyword),
+                                           str(property_id),
                                            str(object_path)))
     for conflict in self.getConflictList():
       LOG('manageLocalValue, conflict:',0,conflict)
-      if conflict.getKeyword() == keyword:
-        LOG('manageLocalValue',0,'found the keyword')
+      if conflict.getPropertyId() == property_id:
+        LOG('manageLocalValue',0,'found the property_id')
         if '/'.join(conflict.getObjectPath())==object_path:
           if conflict.getSubscriber().getSubscriptionUrl()==subscription_url:
             conflict.applySubscriberValue()

product/ERP5SyncML/dtml/manageConflicts.dtml

@@ -36,12 +36,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
     <th align="left" valign="top">Side</th>
     <th align="left" valign="top">Object path</th>
     <th align="left" valign="top">Property Id</th>
-    <th align="left" valign="top">Local Value</th>
-    <th align="left" valign="top">Remote Value</th>
+    <th align="left" valign="top">Publisher Value</th>
+    <th align="left" valign="top">Subscriber Value</th>
   </tr>
   <dtml-in prefix="loop" expr="getConflictList()">
       <tr>
-        <td align="left" valign="top"><a href="manageLocalValue?subscription_url=<dtml-var expr="loop_item.getSubscriber().getSubscriptionUrl()">&property_id=<dtml-var expr="loop_item.getPropertyId()">&object_path=<dtml-var "'/'.join(object_path)">">Publisher</a> <a href="manageRemoteValue?subscription_url=<dtml-var expr="loop_item.getSubscriber().getSubscriptionUrl()">&property_id=<dtml-var expr="loop_item.getPropertyId()">&object_path=<dtml-var "'/'.join(object_path)">">Subscriber</a></td>
+        <td align="left" valign="top"><a href="managePublisherValue?subscription_url=<dtml-var expr="loop_item.getSubscriber().getSubscriptionUrl()">&property_id=<dtml-var expr="loop_item.getPropertyId()">&object_path=<dtml-var "'/'.join(object_path)">">Publisher</a> <a href="manageSubscriberValue?subscription_url=<dtml-var expr="loop_item.getSubscriber().getSubscriptionUrl()">&property_id=<dtml-var expr="loop_item.getPropertyId()">&object_path=<dtml-var "'/'.join(object_path)">">Subscriber</a></td>
         <td align="left" valign="top"><dtml-var expr="loop_item.getSubscriber().getSubscriptionUrl()"></td>
         <td align="left" valign="top"><dtml-var "'/'.join(object_path)"></td>
         <td align="left" valign="top"><dtml-var expr="loop_item.getPropertyId()"></td>