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
6341787e
Commit
6341787e
authored
Jul 29, 2016
by
iv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ERP5Workflow: revert changes on changing actbox_foo to action_box_foo
parent
b0018a19
Changes
30
Hide whitespace changes
Inline
Side-by-side
Showing
30 changed files
with
176 additions
and
213 deletions
+176
-213
bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/Workflow_getGraph.xml
...Item/portal_skins/erp5_graph_editor/Workflow_getGraph.xml
+2
-2
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Transition_view.xml
...mplateItem/portal_skins/erp5_workflow/Transition_view.xml
+4
-4
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Transition_view/my_actbox_category.xml
...kins/erp5_workflow/Transition_view/my_actbox_category.xml
+1
-1
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Transition_view/my_actbox_icon.xml
...al_skins/erp5_workflow/Transition_view/my_actbox_icon.xml
+1
-1
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Transition_view/my_actbox_name.xml
...al_skins/erp5_workflow/Transition_view/my_actbox_name.xml
+1
-1
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Transition_view/my_actbox_url.xml
...tal_skins/erp5_workflow/Transition_view/my_actbox_url.xml
+1
-1
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Worklist_view.xml
...TemplateItem/portal_skins/erp5_workflow/Worklist_view.xml
+4
-4
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Worklist_view/my_actbox_category.xml
..._skins/erp5_workflow/Worklist_view/my_actbox_category.xml
+1
-1
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Worklist_view/my_actbox_icon.xml
...rtal_skins/erp5_workflow/Worklist_view/my_actbox_icon.xml
+1
-1
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Worklist_view/my_actbox_name.xml
...rtal_skins/erp5_workflow/Worklist_view/my_actbox_name.xml
+1
-1
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Worklist_view/my_actbox_url.xml
...ortal_skins/erp5_workflow/Worklist_view/my_actbox_url.xml
+1
-1
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Transition/actbox_category_property.xml
...l_property_sheets/Transition/actbox_category_property.xml
+0
-0
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Transition/actbox_icon_property.xml
...ortal_property_sheets/Transition/actbox_icon_property.xml
+0
-0
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Transition/actbox_name_property.xml
...ortal_property_sheets/Transition/actbox_name_property.xml
+0
-0
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Transition/actbox_url_property.xml
...portal_property_sheets/Transition/actbox_url_property.xml
+0
-0
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Transition/action_box_category_property.xml
...operty_sheets/Transition/action_box_category_property.xml
+0
-44
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Transition/action_box_icon_property.xml
...l_property_sheets/Transition/action_box_icon_property.xml
+0
-44
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Transition/action_box_url_property.xml
...al_property_sheets/Transition/action_box_url_property.xml
+0
-50
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Transition/trigger_type_property.xml
...rtal_property_sheets/Transition/trigger_type_property.xml
+1
-3
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Worklist/actbox_category_property.xml
...tal_property_sheets/Worklist/actbox_category_property.xml
+38
-0
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Worklist/actbox_icon_property.xml
.../portal_property_sheets/Worklist/actbox_icon_property.xml
+38
-0
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Worklist/actbox_name_property.xml
.../portal_property_sheets/Worklist/actbox_name_property.xml
+38
-0
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Worklist/actbox_url_property.xml
...m/portal_property_sheets/Worklist/actbox_url_property.xml
+6
-6
product/ERP5/bootstrap/erp5_property_sheets/bt/template_property_sheet_id_list
...p/erp5_property_sheets/bt/template_property_sheet_id_list
+0
-8
product/ERP5Workflow/Document/Interaction.py
product/ERP5Workflow/Document/Interaction.py
+3
-3
product/ERP5Workflow/Document/InteractionWorkflow.py
product/ERP5Workflow/Document/InteractionWorkflow.py
+6
-9
product/ERP5Workflow/Document/Transition.py
product/ERP5Workflow/Document/Transition.py
+4
-4
product/ERP5Workflow/Document/Workflow.py
product/ERP5Workflow/Document/Workflow.py
+12
-12
product/ERP5Workflow/Document/Worklist.py
product/ERP5Workflow/Document/Worklist.py
+4
-4
product/ERP5Workflow/Tool/WorkflowTool.py
product/ERP5Workflow/Tool/WorkflowTool.py
+8
-8
No files found.
bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/Workflow_getGraph.xml
View file @
6341787e
...
@@ -83,9 +83,9 @@ def getWorkflowGraph(workflow):\n
...
@@ -83,9 +83,9 @@ def getWorkflowGraph(workflow):\n
dict(_class=\'workflow.transition\',\n
dict(_class=\'workflow.transition\',\n
source=state.getId(),\n
source=state.getId(),\n
destination=transition.getDestinationId(),\n
destination=transition.getDestinationId(),\n
name=transition.getAct
ionB
oxName() or transition.getTitleOrId(),\n
name=transition.getAct
b
oxName() or transition.getTitleOrId(),\n
description=transition.getDescription(),\n
description=transition.getDescription(),\n
actbox_url=transition.getAct
ionB
oxUrl(),\n
actbox_url=transition.getAct
b
oxUrl(),\n
transition_id=transition.getId() # used for edition.\n
transition_id=transition.getId() # used for edition.\n
))\n
))\n
else:\n
else:\n
...
...
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Transition_view.xml
View file @
6341787e
...
@@ -92,10 +92,10 @@
...
@@ -92,10 +92,10 @@
<string>
my_title
</string>
<string>
my_title
</string>
<string>
my_destination_title
</string>
<string>
my_destination_title
</string>
<string>
my_guard_expression
</string>
<string>
my_guard_expression
</string>
<string>
my_act
ion_
box_name
</string>
<string>
my_actbox_name
</string>
<string>
my_act
ion_
box_url
</string>
<string>
my_actbox_url
</string>
<string>
my_act
ion_
box_icon
</string>
<string>
my_actbox_icon
</string>
<string>
my_act
ion_
box_category
</string>
<string>
my_actbox_category
</string>
<string>
my_trigger_type
</string>
<string>
my_trigger_type
</string>
</list>
</list>
</value>
</value>
...
...
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Transition_view/my_act
ion_
box_category.xml
→
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Transition_view/my_actbox_category.xml
View file @
6341787e
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
my_act
ion_
box_category
</string>
</value>
<value>
<string>
my_actbox_category
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
message_values
</string>
</key>
<key>
<string>
message_values
</string>
</key>
...
...
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/
Worklist_view/my_action_
box_icon.xml
→
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/
Transition_view/my_act
box_icon.xml
View file @
6341787e
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
my_act
ion_
box_icon
</string>
</value>
<value>
<string>
my_actbox_icon
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
message_values
</string>
</key>
<key>
<string>
message_values
</string>
</key>
...
...
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Transition_view/my_act
ion_
box_name.xml
→
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Transition_view/my_actbox_name.xml
View file @
6341787e
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
my_act
ion_
box_name
</string>
</value>
<value>
<string>
my_actbox_name
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
message_values
</string>
</key>
<key>
<string>
message_values
</string>
</key>
...
...
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Transition_view/my_act
ion_
box_url.xml
→
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Transition_view/my_actbox_url.xml
View file @
6341787e
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
my_act
ion_
box_url
</string>
</value>
<value>
<string>
my_actbox_url
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
message_values
</string>
</key>
<key>
<string>
message_values
</string>
</key>
...
...
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Worklist_view.xml
View file @
6341787e
...
@@ -95,10 +95,10 @@
...
@@ -95,10 +95,10 @@
<string>
my_matched_simulation_state_list
</string>
<string>
my_matched_simulation_state_list
</string>
<string>
my_matched_validation_state_list
</string>
<string>
my_matched_validation_state_list
</string>
<string>
my_matched_causality_state
</string>
<string>
my_matched_causality_state
</string>
<string>
my_act
ion_
box_name
</string>
<string>
my_actbox_name
</string>
<string>
my_act
ion_
box_url
</string>
<string>
my_actbox_url
</string>
<string>
my_act
ion_
box_icon
</string>
<string>
my_actbox_icon
</string>
<string>
my_act
ion_
box_category
</string>
<string>
my_actbox_category
</string>
</list>
</list>
</value>
</value>
</item>
</item>
...
...
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Worklist_view/my_act
ion_
box_category.xml
→
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Worklist_view/my_actbox_category.xml
View file @
6341787e
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
my_act
ion_
box_category
</string>
</value>
<value>
<string>
my_actbox_category
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
message_values
</string>
</key>
<key>
<string>
message_values
</string>
</key>
...
...
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/
Transition_view/my_action_
box_icon.xml
→
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/
Worklist_view/my_act
box_icon.xml
View file @
6341787e
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
my_act
ion_
box_icon
</string>
</value>
<value>
<string>
my_actbox_icon
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
message_values
</string>
</key>
<key>
<string>
message_values
</string>
</key>
...
...
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Worklist_view/my_act
ion_
box_name.xml
→
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Worklist_view/my_actbox_name.xml
View file @
6341787e
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
my_act
ion_
box_name
</string>
</value>
<value>
<string>
my_actbox_name
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
message_values
</string>
</key>
<key>
<string>
message_values
</string>
</key>
...
...
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Worklist_view/my_act
ion_
box_url.xml
→
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Worklist_view/my_actbox_url.xml
View file @
6341787e
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
my_act
ion_
box_url
</string>
</value>
<value>
<string>
my_actbox_url
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
message_values
</string>
</key>
<key>
<string>
message_values
</string>
</key>
...
...
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/
Worklist/action_
box_category_property.xml
→
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/
Transition/act
box_category_property.xml
View file @
6341787e
File moved
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/
Worklist/action_
box_icon_property.xml
→
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/
Transition/act
box_icon_property.xml
View file @
6341787e
File moved
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/
Worklist/action_
box_name_property.xml
→
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/
Transition/act
box_name_property.xml
View file @
6341787e
File moved
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/
Worklist/action_
box_url_property.xml
→
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/
Transition/act
box_url_property.xml
View file @
6341787e
File moved
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Transition/action_box_category_property.xml
deleted
100644 → 0
View file @
b0018a19
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Standard Property"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
categories
</string>
</key>
<value>
<tuple>
<string>
elementary_type/string
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
default_reference
</string>
</key>
<value>
<string>
action_box_category
</string>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
action_box_category_property
</string>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Standard Property
</string>
</value>
</item>
<item>
<key>
<string>
storage_id
</string>
</key>
<value>
<none/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Transition/action_box_icon_property.xml
deleted
100644 → 0
View file @
b0018a19
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Standard Property"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
categories
</string>
</key>
<value>
<tuple>
<string>
elementary_type/string
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
default_reference
</string>
</key>
<value>
<string>
action_box_icon
</string>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
action_box_icon_property
</string>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Standard Property
</string>
</value>
</item>
<item>
<key>
<string>
storage_id
</string>
</key>
<value>
<none/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Transition/action_box_url_property.xml
deleted
100644 → 0
View file @
b0018a19
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Standard Property"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
categories
</string>
</key>
<value>
<tuple>
<string>
elementary_type/string
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
default_reference
</string>
</key>
<value>
<string>
action_box_url
</string>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
action_box_url_property
</string>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Standard Property
</string>
</value>
</item>
<item>
<key>
<string>
property_default
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
storage_id
</string>
</key>
<value>
<none/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Transition/trigger_type_property.xml
View file @
6341787e
...
@@ -30,9 +30,7 @@
...
@@ -30,9 +30,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
storage_id
</string>
</key>
<key>
<string>
storage_id
</string>
</key>
<value>
<value>
<string>
trigger_type
</string>
</value>
<none/>
</value>
</item>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
...
...
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Worklist/actbox_category_property.xml
0 → 100644
View file @
6341787e
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Standard Property"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
categories
</string>
</key>
<value>
<tuple>
<string>
elementary_type/string
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
actbox_category_property
</string>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Standard Property
</string>
</value>
</item>
<item>
<key>
<string>
storage_id
</string>
</key>
<value>
<string>
actbox_category
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Worklist/actbox_icon_property.xml
0 → 100644
View file @
6341787e
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Standard Property"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
categories
</string>
</key>
<value>
<tuple>
<string>
elementary_type/string
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
actbox_icon_property
</string>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Standard Property
</string>
</value>
</item>
<item>
<key>
<string>
storage_id
</string>
</key>
<value>
<string>
actbox_icon
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Worklist/actbox_name_property.xml
0 → 100644
View file @
6341787e
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Standard Property"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
categories
</string>
</key>
<value>
<tuple>
<string>
elementary_type/string
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
actbox_name_property
</string>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Standard Property
</string>
</value>
</item>
<item>
<key>
<string>
storage_id
</string>
</key>
<value>
<string>
actbox_name
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/
Transition/action_box_name
_property.xml
→
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/
Worklist/actbox_url
_property.xml
View file @
6341787e
...
@@ -14,10 +14,6 @@
...
@@ -14,10 +14,6 @@
</tuple>
</tuple>
</value>
</value>
</item>
</item>
<item>
<key>
<string>
default_reference
</string>
</key>
<value>
<string>
action_box_name
</string>
</value>
</item>
<item>
<item>
<key>
<string>
description
</string>
</key>
<key>
<string>
description
</string>
</key>
<value>
<value>
...
@@ -26,18 +22,22 @@
...
@@ -26,18 +22,22 @@
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
act
ion_box_name
_property
</string>
</value>
<value>
<string>
act
box_url
_property
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
portal_type
</string>
</key>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Standard Property
</string>
</value>
<value>
<string>
Standard Property
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
storage_id
</string>
</key>
<key>
<string>
property_default
</string>
</key>
<value>
<value>
<none/>
<none/>
</value>
</value>
</item>
</item>
<item>
<key>
<string>
storage_id
</string>
</key>
<value>
<string>
actbox_url
</string>
</value>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
</record>
</record>
...
...
product/ERP5/bootstrap/erp5_property_sheets/bt/template_property_sheet_id_list
View file @
6341787e
...
@@ -154,7 +154,6 @@ SortIndex
...
@@ -154,7 +154,6 @@ SortIndex
SQLIdGenerator
SQLIdGenerator
StandardBT5ConfiguratorItem
StandardBT5ConfiguratorItem
StandardProperty
StandardProperty
State
StockCapacity
StockCapacity
SupplyLine
SupplyLine
SupplyLink
SupplyLink
...
@@ -176,7 +175,6 @@ TradeOrderLine
...
@@ -176,7 +175,6 @@ TradeOrderLine
TradePreference
TradePreference
Transformation
Transformation
TransformedResource
TransformedResource
Transition
TranslatableProperty
TranslatableProperty
Url
Url
Variable
Variable
...
@@ -186,13 +184,7 @@ Version
...
@@ -186,13 +184,7 @@ Version
VcsPreference
VcsPreference
WebSection
WebSection
WebSite
WebSite
Workflow
XMLObject
XMLObject
AttributeBlacklistedConstraint
AttributeBlacklistedConstraint
CaptchaPreference
CaptchaPreference
GeographicalPoint
GeographicalPoint
Interaction
InteractionWorkflow
WorkflowConfigurator
WorkflowScript
Worklist
\ No newline at end of file
product/ERP5Workflow/Document/Interaction.py
View file @
6341787e
...
@@ -69,9 +69,9 @@ class Interaction(IdAsReferenceMixin('interaction_', "prefix"), XMLObject):
...
@@ -69,9 +69,9 @@ class Interaction(IdAsReferenceMixin('interaction_', "prefix"), XMLObject):
# these attributes are definded in old interaction but no evidence that
# these attributes are definded in old interaction but no evidence that
# they are in use
# they are in use
act
ion_
box_name
=
''
actbox_name
=
''
act
ion_
box_url
=
''
actbox_url
=
''
act
ion_
box_category
=
'workflow'
actbox_category
=
'workflow'
# Declarative security
# Declarative security
security
=
ClassSecurityInfo
()
security
=
ClassSecurityInfo
()
...
...
product/ERP5Workflow/Document/InteractionWorkflow.py
View file @
6341787e
...
@@ -405,13 +405,11 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow):
...
@@ -405,13 +405,11 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow):
# 1. Interaction as XML
# 1. Interaction as XML
interaction_reference_list
=
[]
interaction_reference_list
=
[]
interaction_list
=
self
.
objectValues
(
portal_type
=
'Interaction'
)
interaction_list
=
self
.
objectValues
(
portal_type
=
'Interaction'
)
interaction_prop_id_to_show
=
sorted
([
'action_box_category'
,
'action_box_url'
,
interaction_prop_id_to_show
=
sorted
([
'actbox_category'
,
'actbox_url'
,
'actbox_name'
,
'action_box_name'
,
'activate_script_name'
,
'after_script_name'
,
'activate_script_name'
,
'after_script_name'
,
'before_commit_script_name'
,
'before_commit_script_name'
,
'description'
,
'groups'
,
'roles'
,
'expr'
,
'description'
,
'groups'
,
'roles'
,
'expr'
,
'permissions'
,
'method_id'
,
'permissions'
,
'method_id'
,
'once_per_transaction'
,
'portal_type_filter'
,
'once_per_transaction'
,
'portal_type_filter'
,
'portal_type_group_filter'
,
'portal_type_group_filter'
,
'script_name'
,
'temporary_document_disallowed'
,
'script_name'
,
'temporary_document_disallowed'
,
'trigger_type'
])
'trigger_type'
])
for
tdef
in
interaction_list
:
for
tdef
in
interaction_list
:
interaction_reference_list
.
append
(
tdef
.
getReference
())
interaction_reference_list
.
append
(
tdef
.
getReference
())
interactions
=
SubElement
(
interaction_workflow
,
'interactions'
,
attrib
=
dict
(
interactions
=
SubElement
(
interaction_workflow
,
'interactions'
,
attrib
=
dict
(
...
@@ -435,8 +433,7 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow):
...
@@ -435,8 +433,7 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow):
property_value
=
tdef
.
getExpression
()
property_value
=
tdef
.
getExpression
()
sub_object
=
SubElement
(
guard
,
property_id
,
attrib
=
dict
(
type
=
'guard configuration'
))
sub_object
=
SubElement
(
guard
,
property_id
,
attrib
=
dict
(
type
=
'guard configuration'
))
# no-property definded action box configuration
# no-property definded action box configuration
elif
property_id
in
[
'action_box_name'
,
'action_box_url'
,
'action_box_category'
,
elif
property_id
in
[
'actbox_name'
,
'actbox_url'
,
'actbox_category'
,
'trigger_type'
]:
'trigger_type'
]:
property_value
=
getattr
(
tdef
,
property_id
,
None
)
property_value
=
getattr
(
tdef
,
property_id
,
None
)
sub_object
=
SubElement
(
interaction
,
property_id
,
attrib
=
dict
(
type
=
'string'
))
sub_object
=
SubElement
(
interaction
,
property_id
,
attrib
=
dict
(
type
=
'string'
))
elif
property_id
in
[
'activate_script_name'
,
'after_script_name'
,
'before_commit_script_name'
,
elif
property_id
in
[
'activate_script_name'
,
'after_script_name'
,
'before_commit_script_name'
,
...
...
product/ERP5Workflow/Document/Transition.py
View file @
6341787e
...
@@ -61,10 +61,10 @@ class Transition(IdAsReferenceMixin("transition_", "prefix"), XMLObject):
...
@@ -61,10 +61,10 @@ class Transition(IdAsReferenceMixin("transition_", "prefix"), XMLObject):
isRADContent
=
1
isRADContent
=
1
trigger_type
=
TRIGGER_USER_ACTION
#zwj: type is int 0, 1, 2
trigger_type
=
TRIGGER_USER_ACTION
#zwj: type is int 0, 1, 2
guard
=
None
guard
=
None
act
ion_
box_name
=
''
actbox_name
=
''
act
ion_
box_url
=
''
actbox_url
=
''
act
ion_
box_icon
=
''
actbox_icon
=
''
act
ion_
box_category
=
'workflow'
actbox_category
=
'workflow'
var_exprs
=
None
# A mapping.
var_exprs
=
None
# A mapping.
default_reference
=
''
default_reference
=
''
# Declarative security
# Declarative security
...
...
product/ERP5Workflow/Document/Workflow.py
View file @
6341787e
...
@@ -314,18 +314,18 @@ class Workflow(IdAsReferenceMixin("", "prefix"), XMLObject):
...
@@ -314,18 +314,18 @@ class Workflow(IdAsReferenceMixin("", "prefix"), XMLObject):
for
tid
in
sdef
.
getDestinationIdList
():
for
tid
in
sdef
.
getDestinationIdList
():
tdef
=
self
.
_getOb
(
id
=
tid
)
tdef
=
self
.
_getOb
(
id
=
tid
)
if
tdef
is
not
None
and
tdef
.
getTriggerType
()
==
TRIGGER_USER_ACTION
and
\
if
tdef
is
not
None
and
tdef
.
getTriggerType
()
==
TRIGGER_USER_ACTION
and
\
tdef
.
getAct
ionB
oxName
()
and
self
.
_checkTransitionGuard
(
tdef
,
document
):
tdef
.
getAct
b
oxName
()
and
self
.
_checkTransitionGuard
(
tdef
,
document
):
if
fmt_data
is
None
:
if
fmt_data
is
None
:
fmt_data
=
TemplateDict
()
fmt_data
=
TemplateDict
()
fmt_data
.
_push
(
info
)
fmt_data
.
_push
(
info
)
fmt_data
.
_push
({
'transition_id'
:
tdef
.
getReference
()})
fmt_data
.
_push
({
'transition_id'
:
tdef
.
getReference
()})
res
.
append
((
tid
,
{
res
.
append
((
tid
,
{
'id'
:
tdef
.
getReference
(),
'id'
:
tdef
.
getReference
(),
'name'
:
tdef
.
getAct
ionB
oxName
()
%
fmt_data
,
'name'
:
tdef
.
getAct
b
oxName
()
%
fmt_data
,
'url'
:
str
(
tdef
.
getAct
ionB
oxUrl
())
%
fmt_data
,
'url'
:
str
(
tdef
.
getAct
b
oxUrl
())
%
fmt_data
,
'icon'
:
str
(
tdef
.
getAct
ionB
oxIcon
())
%
fmt_data
,
'icon'
:
str
(
tdef
.
getAct
b
oxIcon
())
%
fmt_data
,
'permissions'
:
(),
# Predetermined.
'permissions'
:
(),
# Predetermined.
'category'
:
tdef
.
getAct
ionB
oxCategory
(),
'category'
:
tdef
.
getAct
b
oxCategory
(),
'transition'
:
tdef
}))
'transition'
:
tdef
}))
fmt_data
.
_pop
()
fmt_data
.
_pop
()
res
.
sort
()
res
.
sort
()
...
@@ -360,7 +360,7 @@ class Workflow(IdAsReferenceMixin("", "prefix"), XMLObject):
...
@@ -360,7 +360,7 @@ class Workflow(IdAsReferenceMixin("", "prefix"), XMLObject):
workflow_id
=
self
.
getId
()
workflow_id
=
self
.
getId
()
workflow_title
=
self
.
getTitle
()
workflow_title
=
self
.
getTitle
()
for
worklist_definition
in
self
.
getWorklistValueList
():
for
worklist_definition
in
self
.
getWorklistValueList
():
action_box_name
=
worklist_definition
.
getAct
ionB
oxName
()
action_box_name
=
worklist_definition
.
getAct
b
oxName
()
guard
=
worklist_definition
.
getGuard
()
guard
=
worklist_definition
.
getGuard
()
if
action_box_name
:
if
action_box_name
:
variable_match
=
{}
variable_match
=
{}
...
@@ -408,8 +408,8 @@ class Workflow(IdAsReferenceMixin("", "prefix"), XMLObject):
...
@@ -408,8 +408,8 @@ class Workflow(IdAsReferenceMixin("", "prefix"), XMLObject):
'worklist_id'
:
worklist_id
,
'worklist_id'
:
worklist_id
,
'workflow_title'
:
workflow_title
,
'workflow_title'
:
workflow_title
,
'workflow_id'
:
workflow_id
,
'workflow_id'
:
workflow_id
,
'action_box_url'
:
worklist_definition
.
getAct
ionB
oxUrl
(),
'action_box_url'
:
worklist_definition
.
getAct
b
oxUrl
(),
'action_box_category'
:
worklist_definition
.
getAct
ionB
oxCategory
()}
'action_box_category'
:
worklist_definition
.
getAct
b
oxCategory
()}
variable_match_dict
[
worklist_id
]
=
variable_match
variable_match_dict
[
worklist_id
]
=
variable_match
...
@@ -833,8 +833,8 @@ class Workflow(IdAsReferenceMixin("", "prefix"), XMLObject):
...
@@ -833,8 +833,8 @@ class Workflow(IdAsReferenceMixin("", "prefix"), XMLObject):
transition_reference_list
=
[]
transition_reference_list
=
[]
transition_list
=
self
.
objectValues
(
portal_type
=
'Transition'
)
transition_list
=
self
.
objectValues
(
portal_type
=
'Transition'
)
transition_prop_id_to_show
=
[
'description'
,
'new_state_id'
,
transition_prop_id_to_show
=
[
'description'
,
'new_state_id'
,
'trigger_type'
,
'script_name'
,
'after_script_name'
,
'act
ion_
box_category'
,
'trigger_type'
,
'script_name'
,
'after_script_name'
,
'actbox_category'
,
'act
ion_box_icon'
,
'action_box_name'
,
'action_
box_url'
,
'roles'
,
'groups'
,
'act
box_icon'
,
'actbox_name'
,
'act
box_url'
,
'roles'
,
'groups'
,
'permissions'
,
'expr'
,
'transition_variable'
]
'permissions'
,
'expr'
,
'transition_variable'
]
for
tdef
in
self
.
objectValues
(
portal_type
=
'Transition'
):
for
tdef
in
self
.
objectValues
(
portal_type
=
'Transition'
):
transition_reference_list
.
append
(
tdef
.
getReference
())
transition_reference_list
.
append
(
tdef
.
getReference
())
...
@@ -935,8 +935,8 @@ class Workflow(IdAsReferenceMixin("", "prefix"), XMLObject):
...
@@ -935,8 +935,8 @@ class Workflow(IdAsReferenceMixin("", "prefix"), XMLObject):
worklist_list
=
self
.
objectValues
(
portal_type
=
'Worklist'
)
worklist_list
=
self
.
objectValues
(
portal_type
=
'Worklist'
)
worklist_prop_id_to_show
=
[
'description'
,
'matched_portal_type_list'
,
worklist_prop_id_to_show
=
[
'description'
,
'matched_portal_type_list'
,
'matched_validation_state_list'
,
'matched_simulation_state_list'
,
'matched_validation_state_list'
,
'matched_simulation_state_list'
,
'act
ion_box_category'
,
'action_box_name'
,
'action_box_url
'
,
'act
box_category'
,
'actbox_name'
,
'actbox_url'
,
'actbox_icon
'
,
'
action_box_icon'
,
'
roles'
,
'groups'
,
'permissions'
,
'expr'
]
'roles'
,
'groups'
,
'permissions'
,
'expr'
]
for
qdef
in
worklist_list
:
for
qdef
in
worklist_list
:
worklist_reference_list
.
append
(
qdef
.
getReference
())
worklist_reference_list
.
append
(
qdef
.
getReference
())
worklists
=
SubElement
(
workflow
,
'worklists'
,
attrib
=
dict
(
worklist_list
=
str
(
worklist_reference_list
),
worklists
=
SubElement
(
workflow
,
'worklists'
,
attrib
=
dict
(
worklist_list
=
str
(
worklist_reference_list
),
...
...
product/ERP5Workflow/Document/Worklist.py
View file @
6341787e
...
@@ -57,10 +57,10 @@ class Worklist(IdAsReferenceMixin("worklist_", "prefix"), XMLObject):
...
@@ -57,10 +57,10 @@ class Worklist(IdAsReferenceMixin("worklist_", "prefix"), XMLObject):
description = ''
description = ''
var_matches = [] # Compared with catalog when set.
var_matches = [] # Compared with catalog when set.
matched_portal_type = ''
matched_portal_type = ''
act
ion_
box_name = ''
actbox_name = ''
act
ion_
box_url = ''
actbox_url = ''
act
ion_
box_icon = ''
actbox_icon = ''
act
ion_
box_category = '
global
'
actbox_category = '
global
'
guard = None
guard = None
default_reference = ''
default_reference = ''
# Declarative security
# Declarative security
...
...
product/ERP5Workflow/Tool/WorkflowTool.py
View file @
6341787e
...
@@ -300,10 +300,10 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
...
@@ -300,10 +300,10 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
transition
.
setTitle
(
tdef
.
title
)
transition
.
setTitle
(
tdef
.
title
)
transition
.
setReference
(
tdef
.
id
)
transition
.
setReference
(
tdef
.
id
)
transition
.
setTriggerType
(
tdef
.
trigger_type
)
transition
.
setTriggerType
(
tdef
.
trigger_type
)
transition
.
setAct
ionB
oxCategory
(
tdef
.
actbox_category
)
transition
.
setAct
b
oxCategory
(
tdef
.
actbox_category
)
transition
.
setAct
ionB
oxIcon
(
tdef
.
actbox_icon
)
transition
.
setAct
b
oxIcon
(
tdef
.
actbox_icon
)
transition
.
setAct
ionB
oxName
(
tdef
.
actbox_name
)
transition
.
setAct
b
oxName
(
tdef
.
actbox_name
)
transition
.
setAct
ionB
oxUrl
(
tdef
.
actbox_url
)
transition
.
setAct
b
oxUrl
(
tdef
.
actbox_url
)
transition
.
setDescription
(
tdef
.
description
)
transition
.
setDescription
(
tdef
.
description
)
if
tdef
.
after_script_name
is
not
None
:
if
tdef
.
after_script_name
is
not
None
:
# check after script is a Transion or a Script:
# check after script is a Transion or a Script:
...
@@ -412,10 +412,10 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
...
@@ -412,10 +412,10 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
else
:
else
:
worklist_variable_value
.
setVariableValue
(
values
[
0
])
#to be changed?
worklist_variable_value
.
setVariableValue
(
values
[
0
])
#to be changed?
worklist
.
setAct
ionB
oxUrl
(
qdef
.
actbox_url
)
worklist
.
setAct
b
oxUrl
(
qdef
.
actbox_url
)
worklist
.
setAct
ionB
oxCategory
(
qdef
.
actbox_category
)
worklist
.
setAct
b
oxCategory
(
qdef
.
actbox_category
)
worklist
.
setAct
ionB
oxIcon
(
qdef
.
actbox_icon
)
worklist
.
setAct
b
oxIcon
(
qdef
.
actbox_icon
)
worklist
.
setAct
ionB
oxName
(
qdef
.
actbox_name
)
worklist
.
setAct
b
oxName
(
qdef
.
actbox_name
)
# configure guard
# configure guard
if
qdef
.
guard
:
if
qdef
.
guard
:
worklist
.
guard
=
qdef
.
guard
worklist
.
guard
=
qdef
.
guard
...
...
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