diff --git a/product/ERP5SyncML/Document/SyncMLPublication.py b/product/ERP5SyncML/Document/SyncMLPublication.py index 34eab9e3d083e7b3f1d4bd8fc358b2e7daea5cd5..c04b32bf9e49506c416888cc5c623ef11ad87e53 100644 --- a/product/ERP5SyncML/Document/SyncMLPublication.py +++ b/product/ERP5SyncML/Document/SyncMLPublication.py @@ -71,14 +71,8 @@ class SyncMLPublication(SyncMLSubscription): """ Reset all subscribers """ - id_list = [] - for subscriber in self.contentValues(portal_type='SyncML Subscription'): - subscriber.resetSignatureList() - id_list.append(subscriber.getId()) self.activate(activity='SQLQueue', - tag=self.getId(), - after_tag=id_list, - priority=ACTIVITY_PRIORITY).manage_delObjects(id_list) + priority=ACTIVITY_PRIORITY).manage_delObjects(ids=list(self.getObjectIds())) security.declareProtected(Permissions.AccessContentsInformation, 'getConflictList') diff --git a/product/ERP5SyncML/Document/SyncMLSubscription.py b/product/ERP5SyncML/Document/SyncMLSubscription.py index 9a75522a930bfeb36ab0b7b1dceebb4b34631223..5836e03b729c6ece7af40b0f53cafe058094c7c1 100644 --- a/product/ERP5SyncML/Document/SyncMLSubscription.py +++ b/product/ERP5SyncML/Document/SyncMLSubscription.py @@ -403,7 +403,6 @@ class SyncMLSubscription(XMLObject): for i in xrange(0, object_list_len, MAX_OBJECTS): current_id_list = object_id_list[i:i+MAX_OBJECTS] self.activate(activity='SQLQueue', - tag=self.getId(), priority=ACTIVITY_PRIORITY).manage_delObjects(current_id_list) security.declareProtected(Permissions.AccessContentsInformation, @@ -449,7 +448,7 @@ class SyncMLSubscription(XMLObject): 'conflict_resolved_with_merge', 'conflict_resolved_with_client_command_winning'): if self.getIsActivityEnabled(): - signature.activate(tag=self.getId(), activity='SQLQueue', + signature.activate(activity='SQLQueue', priority=ACTIVITY_PRIORITY).reset() else: signature.reset()