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
Titouan Soulard
erp5
Commits
fb18e4e2
Commit
fb18e4e2
authored
May 23, 2022
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
small code simplification
parent
bb2c8893
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
12 deletions
+4
-12
product/ERP5/bootstrap/erp5_core/ToolComponentTemplateItem/portal_components/tool.erp5.SimulationTool.py
...emplateItem/portal_components/tool.erp5.SimulationTool.py
+4
-12
No files found.
product/ERP5/bootstrap/erp5_core/ToolComponentTemplateItem/portal_components/tool.erp5.SimulationTool.py
View file @
fb18e4e2
...
@@ -319,12 +319,8 @@ class SimulationTool(BaseTool):
...
@@ -319,12 +319,8 @@ class SimulationTool(BaseTool):
output_simulation_state
=
[
output_simulation_state
]
output_simulation_state
=
[
output_simulation_state
]
sql_kw
[
'output_simulation_state'
]
=
output_simulation_state
sql_kw
[
'output_simulation_state'
]
=
output_simulation_state
# XXX In this case, we must not set sql_kw[input_simumlation_state] before
# XXX In this case, we must not set sql_kw[input_simumlation_state] before
input_simulation_state
=
None
input_simulation_state
=
sql_kw
.
get
(
'input_simulation_state'
)
output_simulation_state
=
None
output_simulation_state
=
sql_kw
.
get
(
'output_simulation_state'
)
if
'input_simulation_state'
in
sql_kw
:
input_simulation_state
=
sql_kw
.
get
(
'input_simulation_state'
)
if
'output_simulation_state'
in
sql_kw
:
output_simulation_state
=
sql_kw
.
get
(
'output_simulation_state'
)
if
input_simulation_state
is
not
None
\
if
input_simulation_state
is
not
None
\
or
output_simulation_state
is
not
None
:
or
output_simulation_state
is
not
None
:
sql_kw
.
pop
(
'input_simulation_state'
,
None
)
sql_kw
.
pop
(
'input_simulation_state'
,
None
)
...
@@ -2185,12 +2181,8 @@ class SimulationTool(BaseTool):
...
@@ -2185,12 +2181,8 @@ class SimulationTool(BaseTool):
new_kw
[
'date_condition_in_join'
]
=
not
(
new_kw
.
get
(
'input'
)
or
new_kw
.
get
(
'output'
))
new_kw
[
'date_condition_in_join'
]
=
not
(
new_kw
.
get
(
'input'
)
or
new_kw
.
get
(
'output'
))
# Pass simulation state to request
# Pass simulation state to request
if
next_item_simulation_state
:
new_kw
[
'simulation_state_list'
]
=
next_item_simulation_state
or
\
new_kw
[
'simulation_state_list'
]
=
next_item_simulation_state
kw
.
get
(
'item.simulation_state'
)
elif
'item.simulation_state'
in
kw
:
new_kw
[
'simulation_state_list'
]
=
kw
[
'item.simulation_state'
]
else
:
new_kw
[
'simulation_state_list'
]
=
None
return
self
.
Resource_zGetTrackingList
(
src__
=
src__
,
return
self
.
Resource_zGetTrackingList
(
src__
=
src__
,
**
new_kw
)
**
new_kw
)
...
...
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