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
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
ec6473c5
Commit
ec6473c5
authored
Nov 14, 2019
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add comment about recent workaround for circular import dependency
See commit
a93ea5f1
.
parent
d4cde62e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
product/CMFActivity/ActivityTool.py
product/CMFActivity/ActivityTool.py
+3
-0
product/ERP5Type/Core/Folder.py
product/ERP5Type/Core/Folder.py
+1
-0
No files found.
product/CMFActivity/ActivityTool.py
View file @
ec6473c5
...
@@ -603,6 +603,9 @@ def cancelProcessShutdown():
...
@@ -603,6 +603,9 @@ def cancelProcessShutdown():
is_running_lock
.
release
()
is_running_lock
.
release
()
has_processed_shutdown
=
False
has_processed_shutdown
=
False
# Due to a circular import dependency between this module and
# Products.ERP5Type.Core.Folder, both modules must import after the definitions
# of getCurrentNode and Folder (the later is a base class of BaseTool).
from
Products.ERP5Type.Tool.BaseTool
import
BaseTool
from
Products.ERP5Type.Tool.BaseTool
import
BaseTool
# Activating a path means we tried to avoid loading useless
# Activating a path means we tried to avoid loading useless
# data in cache so there would be no gain to expect.
# data in cache so there would be no gain to expect.
...
...
product/ERP5Type/Core/Folder.py
View file @
ec6473c5
...
@@ -1665,6 +1665,7 @@ class Folder(OFSFolder2, CMFBTreeFolder, CMFHBTreeFolder, Base, FolderMixIn):
...
@@ -1665,6 +1665,7 @@ class Folder(OFSFolder2, CMFBTreeFolder, CMFHBTreeFolder, Base, FolderMixIn):
pass
pass
return
'%s/%s'
%
(
url
,
icon
)
return
'%s/%s'
%
(
url
,
icon
)
# See comment in Products.CMFActivity.ActivityTool about the import of BaseTool.
from
Products.CMFActivity.ActivityTool
import
getCurrentNode
from
Products.CMFActivity.ActivityTool
import
getCurrentNode
# We browse all used class from btree and hbtree and set not implemented
# We browse all used class from btree and hbtree and set not implemented
...
...
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