Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kirill Smelkov
erp5
Commits
ec6473c5
Commit
ec6473c5
authored
5 years ago
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
No related merge requests found
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():
is_running_lock
.
release
()
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
# Activating a path means we tried to avoid loading useless
# data in cache so there would be no gain to expect.
...
...
This diff is collapsed.
Click to expand it.
product/ERP5Type/Core/Folder.py
View file @
ec6473c5
...
...
@@ -1665,6 +1665,7 @@ class Folder(OFSFolder2, CMFBTreeFolder, CMFHBTreeFolder, Base, FolderMixIn):
pass
return
'%s/%s'
%
(
url
,
icon
)
# See comment in Products.CMFActivity.ActivityTool about the import of BaseTool.
from
Products.CMFActivity.ActivityTool
import
getCurrentNode
# We browse all used class from btree and hbtree and set not implemented
...
...
This diff is collapsed.
Click to expand it.
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