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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
erp5
Commits
9a61b162
Commit
9a61b162
authored
Oct 17, 2016
by
iv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ERP5Workflow: fix parameter name in doActionFor
parent
8c2f568d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
product/ERP5Form/tests/testOOoChart.py
product/ERP5Form/tests/testOOoChart.py
+2
-2
product/ERP5Workflow/Tool/WorkflowTool.py
product/ERP5Workflow/Tool/WorkflowTool.py
+2
-1
No files found.
product/ERP5Form/tests/testOOoChart.py
View file @
9a61b162
...
@@ -101,8 +101,8 @@ class TestOOoChart(ERP5TypeTestCase, ZopeTestCase.Functional):
...
@@ -101,8 +101,8 @@ class TestOOoChart(ERP5TypeTestCase, ZopeTestCase.Functional):
preference
=
self
.
getPortal
().
portal_preferences
.
default_site_preference
preference
=
self
.
getPortal
().
portal_preferences
.
default_site_preference
preference
.
setPriority
(
1
)
preference
.
setPriority
(
1
)
if
preference
.
getPreferenceState
()
==
'disabled'
:
if
preference
.
getPreferenceState
()
==
'disabled'
:
self
.
getWorkflowTool
().
doActionFor
(
ob
=
preference
,
self
.
getWorkflowTool
().
doActionFor
(
preference
,
# object
action
=
'enable_action'
,
'enable_action'
,
# action
wf_id
=
'preference_workflow'
)
wf_id
=
'preference_workflow'
)
self
.
validator
=
Validator
()
self
.
validator
=
Validator
()
...
...
product/ERP5Workflow/Tool/WorkflowTool.py
View file @
9a61b162
...
@@ -190,7 +190,8 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
...
@@ -190,7 +190,8 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
new_ids
=
[
new_workflow_id
,])
new_ids
=
[
new_workflow_id
,])
def
doActionFor
(
self
,
current_object
,
action_reference
,
def
doActionFor
(
self
,
current_object
,
action_reference
,
workflow_id
=
None
,
*
args
,
**
kw
):
wf_id
=
None
,
*
args
,
**
kw
):
workflow_id
=
wf_id
workflow_list
=
self
.
getWorkflowsFor
(
current_object
.
getPortalType
())
workflow_list
=
self
.
getWorkflowsFor
(
current_object
.
getPortalType
())
action_id
=
action_reference
action_id
=
action_reference
if
workflow_id
is
None
:
if
workflow_id
is
None
:
...
...
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