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
Léo-Paul Géneau
erp5
Commits
b5a975f4
Commit
b5a975f4
authored
Oct 01, 2022
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixup! zope4: sortKey should be str in transaction 1.4.1 or later.
parent
ce133017
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
product/CMFActivity/ActivityBuffer.py
product/CMFActivity/ActivityBuffer.py
+1
-1
product/CMFActivity/ActivityConnection.py
product/CMFActivity/ActivityConnection.py
+2
-2
product/ERP5Type/TransactionalVariable.py
product/ERP5Type/TransactionalVariable.py
+1
-1
No files found.
product/CMFActivity/ActivityBuffer.py
View file @
b5a975f4
...
...
@@ -76,4 +76,4 @@ class ActivityBuffer(TM):
def
sortKey
(
self
,
*
ignored
):
"""Activities must be finished before databases commit transactions."""
return
chr
(
1
)
return
chr
(
0
)
product/CMFActivity/ActivityConnection.py
View file @
b5a975f4
...
...
@@ -34,7 +34,7 @@ from Acquisition import aq_parent
# If the sort order below doesn't work, we cannot guarantee the sort key
# used below will actually result in the activity connection being committed
# after the ZODB and Catalog data.
assert
None
<
0
<
''
<
(
),
"Cannot guarantee commit of activities comes after the appropriate data"
assert
''
<
chr
(
0
)
<
chr
(
1
)
<
'xxx'
<
chr
(
255
),
"Cannot guarantee commit of activities comes after the appropriate data"
manage_addActivityConnectionForm
=
HTMLFile
(
'dtml/connectionAdd'
,
globals
())
...
...
@@ -66,4 +66,4 @@ InitializeClass(ActivityConnection)
class
ActivityDB
(
DB
):
_sort_key
=
chr
(
2
)
_sort_key
=
chr
(
2
55
)
product/ERP5Type/TransactionalVariable.py
View file @
b5a975f4
...
...
@@ -70,7 +70,7 @@ class TransactionalVariable(dict):
_unregistered
=
True
def
sortKey
(
self
):
return
chr
(
0
)
return
''
commit
=
tpc_vote
=
tpc_begin
=
tpc_abort
=
lambda
self
,
transaction
:
None
...
...
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