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
Eteri
erp5
Commits
056f420e
Commit
056f420e
authored
Jun 30, 2015
by
wenjie.zheng
Committed by
Sebastien Robin
Jul 16, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WorkflowTool.py: now convert transition variable also.
parent
b098dd14
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
11 deletions
+17
-11
product/ERP5/Tool/WorkflowTool.py
product/ERP5/Tool/WorkflowTool.py
+17
-11
No files found.
product/ERP5/Tool/WorkflowTool.py
View file @
056f420e
...
@@ -271,10 +271,8 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
...
@@ -271,10 +271,8 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
temp_workflow_list
=
[]
temp_workflow_list
=
[]
temp_workflow_id_list
=
[]
temp_workflow_id_list
=
[]
for
dc_workflow
in
self
.
getPortalObject
().
portal_workflow
.
objectValues
():
for
dc_workflow
in
self
.
getPortalObject
().
portal_workflow
.
objectValues
():
LOG
(
"Getting workflow '%s'"
%
dc_workflow
.
id
,
WARNING
,
" in WorkflowTool.py 257"
)
workflow_type
=
dc_workflow
.
__class__
.
__name__
workflow_type
=
dc_workflow
.
__class__
.
__name__
if
workflow_type
==
'Workflow'
or
workflow_type
==
'Interaction Workflow'
:
if
workflow_type
==
'Workflow'
or
workflow_type
==
'Interaction Workflow'
:
LOG
(
"Ingore workflow '%s'"
%
dc_workflow
.
id
,
WARNING
,
" in WorkflowTool.py 260"
)
continue
continue
temp_workflow
=
self
.
dc_workflow_asERP5Object
(
self
,
dc_workflow
,
temp_obj
)
temp_workflow
=
self
.
dc_workflow_asERP5Object
(
self
,
dc_workflow
,
temp_obj
)
temp_workflow_list
.
append
(
temp_workflow
)
temp_workflow_list
.
append
(
temp_workflow
)
...
@@ -294,8 +292,6 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
...
@@ -294,8 +292,6 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
workflow
=
container
.
newContent
(
id
=
new_id
,
portal_type
=
'Workflow'
,
temp_object
=
temp
)
workflow
=
container
.
newContent
(
id
=
new_id
,
portal_type
=
'Workflow'
,
temp_object
=
temp
)
workflow
.
setStateVariable
(
dc_workflow
.
state_var
)
workflow
.
setStateVariable
(
dc_workflow
.
state_var
)
workflow
.
setWorkflowManagedPermission
(
dc_workflow
.
permissions
)
workflow
.
setWorkflowManagedPermission
(
dc_workflow
.
permissions
)
else
:
else
:
if
temp
==
0
:
if
temp
==
0
:
new_id
=
'interactionworkflow_'
+
dc_workflow
.
id
new_id
=
'interactionworkflow_'
+
dc_workflow
.
id
...
@@ -312,7 +308,7 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
...
@@ -312,7 +308,7 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
workflow
.
edit
(
title
=
dc_workflow
.
title
)
workflow
.
edit
(
title
=
dc_workflow
.
title
)
workflow
.
edit
(
description
=
dc_workflow
.
description
)
workflow
.
edit
(
description
=
dc_workflow
.
description
)
if
temp
==
0
:
# convert under request only
if
temp
==
0
:
# create transitions
# create transitions
if
workflow_type_id
==
'DCWorkflowDefinition'
:
if
workflow_type_id
==
'DCWorkflowDefinition'
:
for
tid
in
dc_workflow
.
transitions
:
for
tid
in
dc_workflow
.
transitions
:
...
@@ -362,12 +358,10 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
...
@@ -362,12 +358,10 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
pr_cell
=
state
.
newContent
(
id
=
'cell_%s_%s'
%
(
i
,
j
),
portal_type
=
'PermissionRoles'
)
pr_cell
=
state
.
newContent
(
id
=
'cell_%s_%s'
%
(
i
,
j
),
portal_type
=
'PermissionRoles'
)
if
permission
in
permission_roles
and
role
in
permission_roles
[
permission
]:
if
permission
in
permission_roles
and
role
in
permission_roles
[
permission
]:
pr_cell
.
is_selected
=
1
pr_cell
.
is_selected
=
1
# Set Workflow default state using category setter
# Set Workflow default state using category setter
state_path
=
getattr
(
workflow
,
'state_'
+
dc_workflow
.
initial_state
).
getPath
()
state_path
=
getattr
(
workflow
,
'state_'
+
dc_workflow
.
initial_state
).
getPath
()
state_path
=
'source/'
+
'/'
.
join
(
state_path
.
split
(
'/'
)[
2
:])
state_path
=
'source/'
+
'/'
.
join
(
state_path
.
split
(
'/'
)[
2
:])
workflow
.
setCategoryList
([
state_path
])
workflow
.
setCategoryList
([
state_path
])
# set state's possible transitions:
# set state's possible transitions:
for
sid
in
dc_workflow
.
states
:
for
sid
in
dc_workflow
.
states
:
sdef
=
workflow
.
_getOb
(
'state_'
+
sid
)
sdef
=
workflow
.
_getOb
(
'state_'
+
sid
)
...
@@ -377,7 +371,6 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
...
@@ -377,7 +371,6 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
tr_path
=
'destination/'
+
'/'
.
join
(
tr_path
.
split
(
'/'
)[
2
:])
tr_path
=
'destination/'
+
'/'
.
join
(
tr_path
.
split
(
'/'
)[
2
:])
new_category
.
append
(
tr_path
)
new_category
.
append
(
tr_path
)
sdef
.
setCategoryList
(
new_category
)
sdef
.
setCategoryList
(
new_category
)
# set transition's destination state:
# set transition's destination state:
for
tid
in
dc_workflow
.
transitions
:
for
tid
in
dc_workflow
.
transitions
:
tdef
=
workflow
.
_getOb
(
'transition_'
+
tid
)
tdef
=
workflow
.
_getOb
(
'transition_'
+
tid
)
...
@@ -387,7 +380,6 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
...
@@ -387,7 +380,6 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
continue
continue
state_path
=
'destination/'
+
'/'
.
join
(
state
.
getPath
().
split
(
'/'
)[
2
:])
state_path
=
'destination/'
+
'/'
.
join
(
state
.
getPath
().
split
(
'/'
)[
2
:])
tdef
.
setCategoryList
([
state_path
])
tdef
.
setCategoryList
([
state_path
])
# create worklists (portal_type = Worklist)
# create worklists (portal_type = Worklist)
for
qid
in
dc_workflow
.
worklists
:
for
qid
in
dc_workflow
.
worklists
:
qdef
=
dc_workflow
.
worklists
.
get
(
qid
)
qdef
=
dc_workflow
.
worklists
.
get
(
qid
)
...
@@ -460,7 +452,6 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
...
@@ -460,7 +452,6 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
interaction
.
setTriggerOncePerTransaction
(
tdef
.
once_per_transaction
)
interaction
.
setTriggerOncePerTransaction
(
tdef
.
once_per_transaction
)
interaction
.
setTriggerType
(
tdef
.
trigger_type
)
interaction
.
setTriggerType
(
tdef
.
trigger_type
)
interaction
.
setDescription
(
tdef
.
description
)
interaction
.
setDescription
(
tdef
.
description
)
# create scripts (portal_type = Workflow Script)
# create scripts (portal_type = Workflow Script)
for
script_id
in
dc_workflow
.
scripts
:
for
script_id
in
dc_workflow
.
scripts
:
script
=
dc_workflow
.
scripts
.
get
(
script_id
)
script
=
dc_workflow
.
scripts
.
get
(
script_id
)
...
@@ -482,7 +473,6 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
...
@@ -482,7 +473,6 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
# for a very specific case, action return the reference of transition
# for a very specific case, action return the reference of transition
# in order to generation correct workflow history.
# in order to generation correct workflow history.
if
vid
==
'action'
:
if
vid
==
'action'
:
LOG
(
" variable is '%s'"
%
vid
,
WARNING
,
" in WorkflowTool.py 485."
)
variable
.
setDefaultExpr
(
'transition/getReference|nothing'
)
variable
.
setDefaultExpr
(
'transition/getReference|nothing'
)
else
:
variable
.
setDefaultExpr
(
vdef
.
default_expr
.
text
)
else
:
variable
.
setDefaultExpr
(
vdef
.
default_expr
.
text
)
variable
.
info_guard
=
vdef
.
info_guard
variable
.
info_guard
=
vdef
.
info_guard
...
@@ -490,6 +480,22 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
...
@@ -490,6 +480,22 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
variable
.
setForStatus
(
vdef
.
for_status
)
variable
.
setForStatus
(
vdef
.
for_status
)
variable
.
setInitialValue
(
vdef
.
default_value
)
variable
.
setInitialValue
(
vdef
.
default_value
)
variable
.
setDescription
(
vdef
.
description
)
variable
.
setDescription
(
vdef
.
description
)
# configure transition variable
for
tid
in
dc_workflow
.
transitions
:
origin_tdef
=
dc_workflow
.
transitions
[
tid
]
transition
=
workflow
.
_getOb
(
'transition_'
+
tid
)
new_category
=
[]
if
origin_tdef
.
var_exprs
is
None
:
var_exprs
=
{}
else
:
var_exprs
=
origin_tdef
.
var_exprs
LOG
(
"transition '%s' has var_exprs '%s'"
%
(
origin_tdef
.
__dict__
,
var_exprs
),
WARNING
,
" in WorkflowTool.py 496"
)
for
key
in
var_exprs
:
tr_var
=
transition
.
newContent
(
portal_type
=
'Transition Variable'
,
temp_object
=
temp
)
tr_var
.
setDefaultExpr
(
var_exprs
[
key
])
tr_var_path
=
getattr
(
workflow
,
'variable_'
+
key
).
getPath
()
tr_var_path
=
'causality/'
+
'/'
.
join
(
tr_path
.
split
(
'/'
)[
2
:])
new_category
.
append
(
tr_var_path
)
tr_var
.
setCausalityList
(
tr_var_path_list
)
return
workflow
return
workflow
def
getChainDict
(
self
):
def
getChainDict
(
self
):
...
...
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