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
Labels
Merge Requests
138
Merge Requests
138
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
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
e46a60c6
Commit
e46a60c6
authored
Sep 15, 2022
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ERP5Type: fix transaction.note "expected text" warning with transaction 2
parent
49ab4e5c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
product/CMFActivity/ActivityTool.py
product/CMFActivity/ActivityTool.py
+1
-1
product/ERP5Type/dynamic/portal_type_class.py
product/ERP5Type/dynamic/portal_type_class.py
+1
-1
No files found.
product/CMFActivity/ActivityTool.py
View file @
e46a60c6
...
@@ -377,7 +377,7 @@ class Message(BaseMessage):
...
@@ -377,7 +377,7 @@ class Message(BaseMessage):
# that method !
# that method !
method
=
getattr
(
obj
,
self
.
method_id
)
method
=
getattr
(
obj
,
self
.
method_id
)
transaction
.
get
().
note
(
transaction
.
get
().
note
(
'CMFActivity '
+
'/'
.
join
(
self
.
object_path
)
+
'/'
+
self
.
method_id
u'CMFActivity {}/{}'
.
format
(
'/'
.
join
(
self
.
object_path
),
self
.
method_id
)
)
)
# Store site info
# Store site info
setSite
(
activity_tool
.
getParentValue
())
setSite
(
activity_tool
.
getParentValue
())
...
...
product/ERP5Type/dynamic/portal_type_class.py
View file @
e46a60c6
...
@@ -507,7 +507,7 @@ def synchronizeDynamicModules(context, force=False):
...
@@ -507,7 +507,7 @@ def synchronizeDynamicModules(context, force=False):
portal
.
portal_skins
.
changeSkin
(
None
)
portal
.
portal_skins
.
changeSkin
(
None
)
TransactionalResource
(
tpc_finish
=
lambda
txn
:
TransactionalResource
(
tpc_finish
=
lambda
txn
:
_bootstrapped
.
add
(
portal
.
id
))
_bootstrapped
.
add
(
portal
.
id
))
transaction
.
get
().
note
(
'Site migrated'
)
transaction
.
get
().
note
(
u
'Site migrated'
)
LOG
(
'ERP5Site'
,
INFO
,
'Transition successful, please update your'
LOG
(
'ERP5Site'
,
INFO
,
'Transition successful, please update your'
' business templates'
)
' business templates'
)
else
:
else
:
...
...
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