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
Klaus Wölfel
erp5
Commits
d3648027
Commit
d3648027
authored
Apr 20, 2021
by
Arnaud Fontaine
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ERP5Workflow: No need for Transition Variables on Interactions, never used in ERP5 (!1378).
parent
e79a6eef
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
2 additions
and
24 deletions
+2
-24
product/ERP5/Interaction.py
product/ERP5/Interaction.py
+0
-5
product/ERP5/bootstrap/erp5_core/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
...eAllowedContentTypeTemplateItem/allowed_content_types.xml
+0
-3
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InteractionWorkflowInteraction_view.xml
...l_skins/erp5_core/InteractionWorkflowInteraction_view.xml
+1
-3
product/ERP5/bootstrap/erp5_core/bt/template_portal_type_allowed_content_type_list
...p5_core/bt/template_portal_type_allowed_content_type_list
+0
-1
product/ERP5Type/Core/InteractionWorkflow.py
product/ERP5Type/Core/InteractionWorkflow.py
+1
-4
product/ERP5Type/Core/InteractionWorkflowInteraction.py
product/ERP5Type/Core/InteractionWorkflowInteraction.py
+0
-8
No files found.
product/ERP5/Interaction.py
View file @
d3648027
...
@@ -311,11 +311,6 @@ class InteractionDefinition (SimpleItem):
...
@@ -311,11 +311,6 @@ class InteractionDefinition (SimpleItem):
return
[]
return
[]
return
self
.
portal_type_group_filter
return
self
.
portal_type_group_filter
def
getTransitionVariableValueList
(
self
):
if
self
.
var_exprs
is
None
:
return
[]
return
self
.
var_exprs
showDict
=
Base
.
showDict
showDict
=
Base
.
showDict
convertToERP5Workflow
=
convertToERP5Workflow
convertToERP5Workflow
=
convertToERP5Workflow
...
...
product/ERP5/bootstrap/erp5_core/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
View file @
d3648027
...
@@ -73,9 +73,6 @@
...
@@ -73,9 +73,6 @@
<item>
SQL Non Continuous Increasing Id Generator
</item>
<item>
SQL Non Continuous Increasing Id Generator
</item>
<item>
ZODB Continuous Increasing Id Generator
</item>
<item>
ZODB Continuous Increasing Id Generator
</item>
</portal_type>
</portal_type>
<portal_type
id=
"Interaction"
>
<item>
Transition Variable
</item>
</portal_type>
<portal_type
id=
"Interaction Workflow"
>
<portal_type
id=
"Interaction Workflow"
>
<item>
Interaction Workflow Interaction
</item>
<item>
Interaction Workflow Interaction
</item>
<item>
Workflow Script
</item>
<item>
Workflow Script
</item>
...
...
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InteractionWorkflowInteraction_view.xml
View file @
d3648027
...
@@ -53,9 +53,7 @@
...
@@ -53,9 +53,7 @@
<item>
<item>
<key>
<string>
bottom
</string>
</key>
<key>
<string>
bottom
</string>
</key>
<value>
<value>
<list>
<list/>
<string>
listbox
</string>
</list>
</value>
</value>
</item>
</item>
<item>
<item>
...
...
product/ERP5/bootstrap/erp5_core/bt/template_portal_type_allowed_content_type_list
View file @
d3648027
...
@@ -37,7 +37,6 @@ Id Tool | ZODB Continuous Increasing Id Generator
...
@@ -37,7 +37,6 @@ Id Tool | ZODB Continuous Increasing Id Generator
Interaction Workflow | Interaction Workflow Interaction
Interaction Workflow | Interaction Workflow Interaction
Interaction Workflow | Workflow Script
Interaction Workflow | Workflow Script
Interaction Workflow | Workflow Variable
Interaction Workflow | Workflow Variable
Interaction | Transition Variable
Memcached Tool | Memcached Plugin
Memcached Tool | Memcached Plugin
Preference Tool Type | Action Information
Preference Tool Type | Action Information
Preference Tool Type | Role Information
Preference Tool Type | Role Information
...
...
product/ERP5Type/Core/InteractionWorkflow.py
View file @
d3648027
...
@@ -244,16 +244,13 @@ class InteractionWorkflow(Workflow):
...
@@ -244,16 +244,13 @@ class InteractionWorkflow(Workflow):
sci
=
None
sci
=
None
# Update variables.
# Update variables.
tdef_exprs
=
{
v
.
getId
():
v
for
v
in
tdef
.
getTransitionVariableValueList
()}
status
=
{}
status
=
{}
for
vdef
in
workflow_variable_list
:
for
vdef
in
workflow_variable_list
:
id_
=
vdef
.
getId
()
id_
=
vdef
.
getId
()
if
not
vdef
.
getStatusIncluded
():
if
not
vdef
.
getStatusIncluded
():
continue
continue
expression
=
None
expression
=
None
if
id_
in
tdef_exprs
:
if
not
vdef
.
getAutomaticUpdate
()
and
id_
in
former_status
:
expression
=
tdef_exprs
[
id_
]
elif
not
vdef
.
getAutomaticUpdate
()
and
id_
in
former_status
:
# Preserve former value
# Preserve former value
value
=
former_status
[
id_
]
value
=
former_status
[
id_
]
else
:
else
:
...
...
product/ERP5Type/Core/InteractionWorkflowInteraction.py
View file @
d3648027
...
@@ -117,11 +117,3 @@ class InteractionWorkflowInteraction(IdAsReferenceMixin('interaction_'),
...
@@ -117,11 +117,3 @@ class InteractionWorkflowInteraction(IdAsReferenceMixin('interaction_'),
prefix_length
=
len
(
'before_commit_script/'
)
prefix_length
=
len
(
'before_commit_script/'
)
return
[
path
[
prefix_length
:]
for
path
in
self
.
getCategoryList
()
return
[
path
[
prefix_length
:]
for
path
in
self
.
getCategoryList
()
if
path
.
startswith
(
'before_commit_script/'
)]
if
path
.
startswith
(
'before_commit_script/'
)]
security
.
declareProtected
(
Permissions
.
AccessContentsInformation
,
'getTransitionVariableValueList'
)
def
getTransitionVariableValueList
(
self
):
"""
Return Transition Variables
"""
return
self
.
objectValues
(
portal_type
=
'Transition Variable'
)
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