Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Hamza
erp5
Commits
31afbf6c
Commit
31afbf6c
authored
Jan 20, 2012
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove needless activity dependencies that can cause infinite dependency loop.
parent
6731ccd8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
9 deletions
+2
-9
product/ERP5SyncML/Document/SyncMLPublication.py
product/ERP5SyncML/Document/SyncMLPublication.py
+1
-7
product/ERP5SyncML/Document/SyncMLSubscription.py
product/ERP5SyncML/Document/SyncMLSubscription.py
+1
-2
No files found.
product/ERP5SyncML/Document/SyncMLPublication.py
View file @
31afbf6c
...
...
@@ -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'
)
...
...
product/ERP5SyncML/Document/SyncMLSubscription.py
View file @
31afbf6c
...
...
@@ -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
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment