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
Sebastien Robin
erp5
Commits
bc6ae22b
Commit
bc6ae22b
authored
Jul 13, 2016
by
iv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ERP5Workflow: remove getParentWorkflowValue to use getParentValue method
parent
bfe4d8c0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
6 deletions
+3
-6
product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.FolderWorkflowActionUtils.py
...al_components/extension.erp5.FolderWorkflowActionUtils.py
+1
-1
product/ERP5Type/patches/DCWorkflow.py
product/ERP5Type/patches/DCWorkflow.py
+2
-2
product/ERP5Workflow/Document/Transition.py
product/ERP5Workflow/Document/Transition.py
+0
-3
No files found.
product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.FolderWorkflowActionUtils.py
View file @
bc6ae22b
...
@@ -210,7 +210,7 @@ def getPossibleWorkflowActionItemList(self, brain, **kw):
...
@@ -210,7 +210,7 @@ def getPossibleWorkflowActionItemList(self, brain, **kw):
for
action
in
portal
.
portal_actions
.
listFilteredActionsFor
(
brain
).
get
(
'workflow'
,
[]):
for
action
in
portal
.
portal_actions
.
listFilteredActionsFor
(
brain
).
get
(
'workflow'
,
[]):
transition
=
action
.
get
(
'transition'
,
None
)
transition
=
action
.
get
(
'transition'
,
None
)
if
transition
is
not
None
:
if
transition
is
not
None
:
workflow_id
=
action
[
'transition'
].
getParent
Workflow
Value
().
getId
()
workflow_id
=
action
[
'transition'
].
getParentValue
().
getId
()
if
workflow_id
==
brain
.
workflow_id
:
if
workflow_id
==
brain
.
workflow_id
:
dialog_id
=
action
[
'url'
].
split
(
'?'
,
1
)[
0
].
split
(
'/'
)[
-
1
]
dialog_id
=
action
[
'url'
].
split
(
'?'
,
1
)[
0
].
split
(
'/'
)[
-
1
]
dialog_object
=
getattr
(
portal
,
dialog_id
,
None
)
dialog_object
=
getattr
(
portal
,
dialog_id
,
None
)
...
...
product/ERP5Type/patches/DCWorkflow.py
View file @
bc6ae22b
...
@@ -1070,7 +1070,7 @@ def DCWorkflowDefinition_showAsXML(self, root=None):
...
@@ -1070,7 +1070,7 @@ def DCWorkflowDefinition_showAsXML(self, root=None):
return
etree
.
tostring
(
root
,
encoding
=
'utf-8'
,
return
etree
.
tostring
(
root
,
encoding
=
'utf-8'
,
xml_declaration
=
True
,
pretty_print
=
True
)
xml_declaration
=
True
,
pretty_print
=
True
)
def
TransitionDefinition_getParent
Workflow
Value
(
self
):
def
TransitionDefinition_getParentValue
(
self
):
return
self
.
aq_parent
.
aq_parent
return
self
.
aq_parent
.
aq_parent
def
DCWorkflowDefinition_getSourceValue
(
self
):
def
DCWorkflowDefinition_getSourceValue
(
self
):
...
@@ -1113,7 +1113,7 @@ StateDefinition.getReference = method_getReference
...
@@ -1113,7 +1113,7 @@ StateDefinition.getReference = method_getReference
StateDefinition
.
getDestinationIdList
=
StateDefinition_getDestinationIdList
StateDefinition
.
getDestinationIdList
=
StateDefinition_getDestinationIdList
StateDefinition
.
getDestinationReferenceList
=
StateDefinition_getDestinationIdList
StateDefinition
.
getDestinationReferenceList
=
StateDefinition_getDestinationIdList
StateDefinition
.
showDict
=
DCWorkflowDefinition_showDict
StateDefinition
.
showDict
=
DCWorkflowDefinition_showDict
TransitionDefinition
.
getParent
WorkflowValue
=
TransitionDefinition_getParentWorkflow
Value
TransitionDefinition
.
getParent
Value
=
TransitionDefinition_getParent
Value
TransitionDefinition
.
getReference
=
method_getReference
TransitionDefinition
.
getReference
=
method_getReference
TransitionDefinition
.
showDict
=
DCWorkflowDefinition_showDict
TransitionDefinition
.
showDict
=
DCWorkflowDefinition_showDict
VariableDefinition
.
getReference
=
method_getReference
VariableDefinition
.
getReference
=
method_getReference
...
...
product/ERP5Workflow/Document/Transition.py
View file @
bc6ae22b
...
@@ -107,6 +107,3 @@ class Transition(IdAsReferenceMixin("transition_", "prefix"), XMLObject):
...
@@ -107,6 +107,3 @@ class Transition(IdAsReferenceMixin("transition_", "prefix"), XMLObject):
self
.
guard
.
groups
=
self
.
getGroupList
()
self
.
guard
.
groups
=
self
.
getGroupList
()
if
self
.
getExpression
()
is
not
None
:
if
self
.
getExpression
()
is
not
None
:
self
.
guard
.
expr
=
Expression
(
self
.
getExpression
())
self
.
guard
.
expr
=
Expression
(
self
.
getExpression
())
def
getParentWorkflowValue
(
self
):
return
self
.
getParent
()
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