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
Alexander Emmerich
erp5
Commits
18c5463d
Commit
18c5463d
authored
Jun 25, 2015
by
wenjie.zheng
Committed by
Sebastien Robin
Jul 16, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Workflow.py: fix the converted workflow history missing action title.
parent
4efc49d6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
8 deletions
+6
-8
product/ERP5Workflow/Document/Workflow.py
product/ERP5Workflow/Document/Workflow.py
+6
-8
No files found.
product/ERP5Workflow/Document/Workflow.py
View file @
18c5463d
...
...
@@ -635,6 +635,7 @@ class Workflow(IdAsReferenceMixin("workflow_", "prefix"), XMLObject):
# update variables
state_values
=
None
object
=
self
.
getStateChangeInformation
(
document
,
self
.
getSourceValue
())
if
new_sdef
is
not
None
:
state_values
=
getattr
(
new_sdef
,
'var_values'
,
None
)
if
state_values
is
None
:
...
...
@@ -660,11 +661,11 @@ class Workflow(IdAsReferenceMixin("workflow_", "prefix"), XMLObject):
# Preserve former value
value
=
former_status
[
id
]
else
:
if
vdef
.
default_expr
is
not
None
:
expr
=
vdef
.
default_expr
if
vdef
.
getDefaultExpr
()
is
not
None
:
expr
=
vdef
.
getDefaultExpr
()
else
:
value
=
vdef
.
default_value
if
expr
is
not
None
:
value
=
vdef
.
getInitialValue
(
object
=
object
)
if
expr
is
not
None
and
expr
!=
''
:
# Evaluate an expression.
if
econtext
is
None
:
# Lazily create the expression context.
...
...
@@ -676,10 +677,7 @@ class Workflow(IdAsReferenceMixin("workflow_", "prefix"), XMLObject):
econtext
=
Expression_createExprContext
(
sci
)
expr
=
Expression
(
expr
)
value
=
expr
(
econtext
)
if
id_no_suffix
==
"action"
:
status_dict
[
id_no_suffix
]
=
'_'
.
join
(
value
.
split
(
'_'
)[
1
:])
else
:
status_dict
[
id_no_suffix
]
=
value
status_dict
[
id_no_suffix
]
=
value
# Do not proceed in case of failure of before script
if
not
before_script_success
:
...
...
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