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
7a07cc37
Commit
7a07cc37
authored
Jul 15, 2016
by
iv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ERP5Workflow: fix id access on transition + rename abreviated variable
parent
6cd8c706
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldWorkflowList.py
...5_glossary/GlossaryModule_getBusinessFieldWorkflowList.py
+4
-4
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromWorkflow.py
...p5_glossary/GlossaryModule_getTermDictListFromWorkflow.py
+4
-4
No files found.
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldWorkflowList.py
View file @
7a07cc37
...
@@ -28,10 +28,10 @@ def get_obj_and_reference_list(business_field):
...
@@ -28,10 +28,10 @@ def get_obj_and_reference_list(business_field):
result
.
append
((
wf
,
wf_id
,
'workflow'
))
result
.
append
((
wf
,
wf_id
,
'workflow'
))
for
state
in
wf
.
getStateValueList
():
for
state
in
wf
.
getStateValueList
():
result
.
append
((
state
,
state
.
getReference
(),
'state'
))
result
.
append
((
state
,
state
.
getReference
(),
'state'
))
for
trans
in
wf
.
getTransitionValueList
():
for
trans
ition
in
wf
.
getTransitionValueList
():
result
.
append
((
trans
,
trans
.
getReference
(),
'transition'
))
result
.
append
((
trans
ition
,
transaction
.
getReference
(),
'transition'
))
if
trans
.
trigger_type
==
1
and
trans
.
actbox_name
:
# 1 == TRIGGER_USER_ACTION
if
trans
ition
.
trigger_type
==
1
and
transaction
.
actbox_name
:
# 1 == TRIGGER_USER_ACTION
result
.
append
((
trans
,
"%s_actbox_name"
%
trans_id
,
'action'
))
result
.
append
((
trans
ition
,
"%s_actbox_name"
%
transaction
.
getReference
()
,
'action'
))
return
result
return
result
business_field_list
=
[
i
for
i
in
business_field_list
if
i
]
business_field_list
=
[
i
for
i
in
business_field_list
if
i
]
...
...
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromWorkflow.py
View file @
7a07cc37
...
@@ -28,10 +28,10 @@ def get_obj_and_reference_list(business_field):
...
@@ -28,10 +28,10 @@ def get_obj_and_reference_list(business_field):
result
.
append
((
wf
,
wf_id
,
'workflow'
))
result
.
append
((
wf
,
wf_id
,
'workflow'
))
for
state
in
wf
.
getStateValueList
():
for
state
in
wf
.
getStateValueList
():
result
.
append
((
state
,
state
.
getReference
(),
'state'
))
result
.
append
((
state
,
state
.
getReference
(),
'state'
))
for
trans
in
wf
.
getTransitionValueList
():
for
trans
ition
in
wf
.
getTransitionValueList
():
result
.
append
((
trans
,
trans
.
getReference
(),
'transition'
))
result
.
append
((
trans
ition
,
transition
.
getReference
(),
'transition'
))
if
trans
.
trigger_type
==
1
and
trans
.
actbox_name
:
# 1 == TRIGGER_USER_ACTION
if
trans
ition
.
trigger_type
==
1
and
transition
.
actbox_name
:
# 1 == TRIGGER_USER_ACTION
result
.
append
((
trans
,
"%s_actbox_name"
%
trans_id
,
'action'
))
result
.
append
((
trans
ition
,
"%s_actbox_name"
%
transition
.
getReference
()
,
'action'
))
return
result
return
result
business_field_list
=
[
i
for
i
in
business_field_list
if
i
]
business_field_list
=
[
i
for
i
in
business_field_list
if
i
]
...
...
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