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
1
Merge Requests
1
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
Titouan Soulard
erp5
Commits
63ebb7b6
Commit
63ebb7b6
authored
3 years ago
by
Arnaud Fontaine
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
squash! ERP5Workflow: DC Workflows are now ERP5 objects (
!1378
).
parent
5aa717e5
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
73 additions
and
13 deletions
+73
-13
product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Workflow%20Script.xml
...PortalTypeTemplateItem/portal_types/Workflow%20Script.xml
+1
-3
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_generateWorkflowReport.py
...m/portal_skins/erp5_core/Folder_generateWorkflowReport.py
+0
-2
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/WorkflowScript_init.py
...emplateItem/portal_skins/erp5_core/WorkflowScript_init.py
+1
-0
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/WorkflowScript_init.xml
...mplateItem/portal_skins/erp5_core/WorkflowScript_init.xml
+62
-0
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/WorkflowTool_convertWorkflow.py
...em/portal_skins/erp5_core/WorkflowTool_convertWorkflow.py
+7
-6
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Workflow_viewWorkflowScriptList.xml
...ortal_skins/erp5_core/Workflow_viewWorkflowScriptList.xml
+1
-1
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Workflow_viewWorkflowScriptList/listbox.xml
...ins/erp5_core/Workflow_viewWorkflowScriptList/listbox.xml
+1
-1
No files found.
product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Workflow%20Script.xml
View file @
63ebb7b6
...
...
@@ -30,9 +30,7 @@
</item>
<item>
<key>
<string>
init_script
</string>
</key>
<value>
<none/>
</value>
<value>
<string>
WorkflowScript_init
</string>
</value>
</item>
<item>
<key>
<string>
permission
</string>
</key>
...
...
This diff is collapsed.
Click to expand it.
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_generateWorkflowReport.py
View file @
63ebb7b6
...
...
@@ -15,8 +15,6 @@ for portal_type in context.allowedContentTypes():
state_list
=
workflow
.
getStateValueList
()
if
len
(
state_list
)
>
1
:
state_var
=
workflow
.
getStateVariable
()
if
state_var
is
None
:
state_var
=
'state'
workflow_id
=
workflow
.
getId
()
workflow_translated_title_dict
[
workflow_id
]
=
translateString
(
workflow
.
title
)
type_state_variable_workflow_dict
[(
portal_type_id
,
state_var
)]
=
workflow_id
...
...
This diff is collapsed.
Click to expand it.
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/WorkflowScript_init.py
0 → 100644
View file @
63ebb7b6
context
.
setParameterSignature
(
'state_change'
)
This diff is collapsed.
Click to expand it.
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/WorkflowScript_init.xml
0 → 100644
View file @
63ebb7b6
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"PythonScript"
module=
"Products.PythonScripts.PythonScript"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
Script_magic
</string>
</key>
<value>
<int>
3
</int>
</value>
</item>
<item>
<key>
<string>
_bind_names
</string>
</key>
<value>
<object>
<klass>
<global
name=
"NameAssignments"
module=
"Shared.DC.Scripts.Bindings"
/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key>
<string>
_asgns
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
name_container
</string>
</key>
<value>
<string>
container
</string>
</value>
</item>
<item>
<key>
<string>
name_context
</string>
</key>
<value>
<string>
context
</string>
</value>
</item>
<item>
<key>
<string>
name_m_self
</string>
</key>
<value>
<string>
script
</string>
</value>
</item>
<item>
<key>
<string>
name_subpath
</string>
</key>
<value>
<string>
traverse_subpath
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
*args, **kwargs
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
WorkflowScript_init
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
This diff is collapsed.
Click to expand it.
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/WorkflowTool_convertWorkflow.py
View file @
63ebb7b6
...
...
@@ -2,7 +2,7 @@ workflow_list = kw.get('workflow_list')
selected_workflow_list
=
[]
selected_workflow_id_list
=
[]
if
batch_mode
==
Fals
e
and
workflow_id_list
is
None
:
if
not
batch_mod
e
and
workflow_id_list
is
None
:
if
workflow_list
:
for
workflow
in
workflow_list
:
if
workflow
.
get
(
'listbox_selected'
):
...
...
@@ -18,7 +18,10 @@ else:
for
workflow
in
selected_workflow_list
:
if
workflow
is
not
None
and
not
workflow
.
isTempObject
()
and
workflow
.
getPortalType
()
in
(
'Workflow'
,
'Interaction Workflow'
):
return
context
.
Base_redirect
(
if
batch
:
raise
RuntimeError
(
'Workflow(s) already exist.'
)
else
:
return
context
.
Base_redirect
(
'WorkflowTool_viewWorkflowConversionDialog'
,
keep_items
=
dict
(
portal_status_message
=
'Workflow(s) already exist.'
))
...
...
@@ -27,10 +30,8 @@ for workflow in selected_workflow_list:
context
.
reassignWorkflow
(
new_workflow
.
getId
())
selected_workflow_id_list
.
append
(
new_workflow
.
getId
())
if
batch_mode
:
return
return
context
.
Base_redirect
(
if
not
batch_mode
:
return
context
.
Base_redirect
(
'view'
,
keep_items
=
dict
(
portal_status_message
=
"Workflows converted: %s"
%
' '
.
join
(
selected_workflow_id_list
)))
This diff is collapsed.
Click to expand it.
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Workflow_viewWorkflowScriptList.xml
View file @
63ebb7b6
...
...
@@ -54,7 +54,7 @@
<key>
<string>
bottom
</string>
</key>
<value>
<list>
<string>
WorkflowScripts
</string>
<string>
listbox
</string>
</list>
</value>
</item>
...
...
This diff is collapsed.
Click to expand it.
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Workflow_viewWorkflowScriptList/
WorkflowScripts
.xml
→
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Workflow_viewWorkflowScriptList/
listbox
.xml
View file @
63ebb7b6
...
...
@@ -22,7 +22,7 @@
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
WorkflowScripts
</string>
</value>
<value>
<string>
listbox
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
...
...
This diff is collapsed.
Click to expand it.
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