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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Łukasz Nowak
erp5
Commits
6defa865
Commit
6defa865
authored
Sep 13, 2019
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement faster getCreationDate response on large workflow lists
parent
16f740ac
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
61 additions
and
14 deletions
+61
-14
product/ERP5Type/Base.py
product/ERP5Type/Base.py
+17
-13
product/ERP5Type/patches/WorkflowTool.py
product/ERP5Type/patches/WorkflowTool.py
+44
-1
No files found.
product/ERP5Type/Base.py
View file @
6defa865
...
@@ -3184,19 +3184,23 @@ class Base( CopyContainer,
...
@@ -3184,19 +3184,23 @@ class Base( CopyContainer,
Returns the creation date of the document based on workflow information
Returns the creation date of the document based on workflow information
"""
"""
# Check if edit_workflow defined
# Check if edit_workflow defined
portal_workflow
=
self
.
getPortalObject
().
portal_workflow
try
:
wf
=
portal_workflow
.
getWorkflowById
(
'edit_workflow'
)
history_list
=
aq_base
(
self
).
workflow_history
wf_list
=
portal_workflow
.
getWorkflowsFor
(
self
)
except
AttributeError
:
if
wf
is
not
None
:
pass
wf_list
=
[
wf
]
+
wf_list
else
:
for
wf
in
wf_list
:
candidate
=
None
try
:
for
wf_id
,
history
in
history_list
.
iteritems
():
history
=
wf
.
getInfoFor
(
self
,
'history'
,
None
)
try
:
except
KeyError
:
if
wf_id
==
"edit_workflow"
:
history
=
None
return
history
[
0
][
'time'
]
if
history
is
not
None
and
len
(
history
):
elif
candidate
is
None
:
# Then get the first line of edit_workflow
candidate
=
history
[
0
][
'time'
]
return
history
[
0
].
get
(
'time'
,
None
)
except
(
IndexError
,
KeyError
,
TypeError
):
pass
if
candidate
is
not
None
:
return
candate
if
getattr
(
aq_base
(
self
),
'CreationDate'
,
None
)
is
not
None
:
if
getattr
(
aq_base
(
self
),
'CreationDate'
,
None
)
is
not
None
:
return
asDate
(
self
.
CreationDate
())
return
asDate
(
self
.
CreationDate
())
return
None
# JPS-XXX - try to find a way to return a creation date instead of None
return
None
# JPS-XXX - try to find a way to return a creation date instead of None
...
...
product/ERP5Type/patches/WorkflowTool.py
View file @
6defa865
...
@@ -722,7 +722,7 @@ def WorkflowTool_refreshWorklistCache(self):
...
@@ -722,7 +722,7 @@ def WorkflowTool_refreshWorklistCache(self):
security
.
declareProtected
(
Permissions
.
ManagePortal
,
'refreshWorklistCache'
)
security
.
declareProtected
(
Permissions
.
ManagePortal
,
'refreshWorklistCache'
)
WorkflowTool
.
refreshWorklistCache
=
WorkflowTool_refreshWorklistCache
WorkflowTool
.
refreshWorklistCache
=
WorkflowTool_refreshWorklistCache
class
WorkflowHistoryList
(
Persistent
):
class
WorkflowHistory
Bucket
List
(
Persistent
):
_bucket_size
=
16
_bucket_size
=
16
def
__init__
(
self
,
iterable
=
None
,
prev
=
None
):
def
__init__
(
self
,
iterable
=
None
,
prev
=
None
):
...
@@ -748,6 +748,13 @@ class WorkflowHistoryList(Persistent):
...
@@ -748,6 +748,13 @@ class WorkflowHistoryList(Persistent):
if
index
<
0
:
if
index
<
0
:
# XXX this implementation is not so good, but rarely used.
# XXX this implementation is not so good, but rarely used.
index
+=
len
(
self
)
index
+=
len
(
self
)
elif
index
<=
self
.
_bucket_size
:
if
getattr
(
self
,
'_first'
,
None
):
# Speed up access to the first elements
return
self
.
_first
.
_slots
[
index
]
if
self
.
_prev
is
not
None
and
getattr
(
self
,
"_init_first"
,
None
):
self
.
_init_first
()
return
self
.
_first
.
_slots
[
index
]
iterator
=
self
.
__iter__
()
iterator
=
self
.
__iter__
()
for
i
in
xrange
(
index
):
for
i
in
xrange
(
index
):
iterator
.
next
()
iterator
.
next
()
...
@@ -806,6 +813,42 @@ class WorkflowHistoryList(Persistent):
...
@@ -806,6 +813,42 @@ class WorkflowHistoryList(Persistent):
self
.
_prev
=
self
.
__class__
(
self
.
_slots
,
prev
=
self
.
_prev
)
self
.
_prev
=
self
.
__class__
(
self
.
_slots
,
prev
=
self
.
_prev
)
self
.
_slots
=
[
value
]
self
.
_slots
=
[
value
]
class
WorkflowHistoryList
(
WorkflowHistoryBucketList
):
def
__init__
(
self
,
iterable
=
None
,
prev
=
None
):
WorkflowHistoryBucketList
.
__init__
(
self
,
iterable
,
prev
)
self
.
_first
=
None
def
_init_first
(
self
):
if
getattr
(
self
,
'_first'
,
None
)
is
None
:
# Handle migration of old workflow history
bucket
=
self
.
_prev
while
bucket
.
_prev
is
not
None
:
bucket
=
bucket
.
_prev
self
.
_first
=
bucket
self
.
_p_changed
=
1
def
append
(
self
,
value
):
if
len
(
self
.
_slots
)
<
self
.
_bucket_size
:
self
.
_slots
.
append
(
value
)
self
.
_p_changed
=
1
else
:
self
.
_prev
=
WorkflowHistoryBucketList
(
self
.
_slots
,
prev
=
self
.
_prev
)
self
.
_slots
=
[
value
]
self
.
_init_first
()
def
__setstate__
(
self
,
state
):
if
len
(
state
)
==
2
:
self
.
_prev
,
self
.
_slots
=
state
self
.
_first
=
None
else
:
self
.
_prev
,
self
.
_slots
,
self
.
_first
=
state
def
__getstate__
(
self
):
return
(
self
.
_prev
,
self
.
_slots
,
getattr
(
self
,
"_first"
,
None
))
def
WorkflowTool_setStatusOf
(
self
,
wf_id
,
ob
,
status
):
def
WorkflowTool_setStatusOf
(
self
,
wf_id
,
ob
,
status
):
""" Append an entry to the workflow history.
""" Append an entry to the workflow history.
...
...
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