From da282554bd1d81e83b69815196f268cb2365c8bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Mon, 12 Jul 2021 10:43:21 +0200 Subject: [PATCH] graph_editor: modernize business process graph editor - set validator, this is now required to be able to edit - use an iframe for ERP5JS compatibility - clean up this form, it had some unused disabled fields, remove them completly instead --- .../BusinessProcess_viewGraphEditor.xml | 12 +- .../listbox.xml | 173 ------------------ .../listbox_delivery_builder_title_list.xml | 90 --------- .../listbox_int_index.xml | 90 --------- .../listbox_order_builder_title_list.xml | 90 --------- .../my_jsplumb_graph.xml | 8 +- .../my_reference.xml | 8 +- .../my_title.xml | 8 +- 8 files changed, 21 insertions(+), 458 deletions(-) delete mode 100644 bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/listbox.xml delete mode 100644 bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/listbox_delivery_builder_title_list.xml delete mode 100644 bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/listbox_int_index.xml delete mode 100644 bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/listbox_order_builder_title_list.xml diff --git a/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor.xml b/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor.xml index 22dd9c49fe..b6245ee7d4 100644 --- a/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor.xml +++ b/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor.xml @@ -75,26 +75,20 @@ <key> <string>bottom</string> </key> <value> <list> - <string>listbox</string> + <string>my_jsplumb_graph</string> </list> </value> </item> <item> <key> <string>center</string> </key> <value> - <list> - <string>my_jsplumb_graph</string> - </list> + <list/> </value> </item> <item> <key> <string>hidden</string> </key> <value> - <list> - <string>listbox_int_index</string> - <string>listbox_order_builder_title_list</string> - <string>listbox_delivery_builder_title_list</string> - </list> + <list/> </value> </item> <item> diff --git a/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/listbox.xml b/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/listbox.xml deleted file mode 100644 index 1b567adc3d..0000000000 --- a/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/listbox.xml +++ /dev/null @@ -1,173 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>delegated_list</string> </key> - <value> - <list> - <string>columns</string> - <string>editable_columns</string> - <string>enabled</string> - <string>portal_types</string> - <string>sort</string> - <string>title</string> - </list> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>listbox</string> </value> - </item> - <item> - <key> <string>message_values</string> </key> - <value> - <dictionary> - <item> - <key> <string>external_validator_failed</string> </key> - <value> <string>The input failed the external validator.</string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>overrides</string> </key> - <value> - <dictionary> - <item> - <key> <string>field_id</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>form_id</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>target</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>tales</string> </key> - <value> - <dictionary> - <item> - <key> <string>field_id</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>form_id</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>target</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>values</string> </key> - <value> - <dictionary> - <item> - <key> <string>columns</string> </key> - <value> - <list> - <tuple> - <string>int_index</string> - <string>Index</string> - </tuple> - <tuple> - <string>title</string> - <string>Title</string> - </tuple> - <tuple> - <string>predecessor_title</string> - <string>Predecessor</string> - </tuple> - <tuple> - <string>successor_title</string> - <string>Successor</string> - </tuple> - <tuple> - <string>order_builder_title_list</string> - <string>Order Builders</string> - </tuple> - <tuple> - <string>delivery_builder_title_list</string> - <string>Delivery Builders</string> - </tuple> - <tuple> - <string>trade_phase_title</string> - <string>Trade Phase</string> - </tuple> - </list> - </value> - </item> - <item> - <key> <string>editable_columns</string> </key> - <value> - <list> - <tuple> - <string>int_index</string> - <string>int_index</string> - </tuple> - </list> - </value> - </item> - <item> - <key> <string>enabled</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>field_id</string> </key> - <value> <string>my_view_mode_listbox</string> </value> - </item> - <item> - <key> <string>form_id</string> </key> - <value> <string>Base_viewTradeFieldLibrary</string> </value> - </item> - <item> - <key> <string>portal_types</string> </key> - <value> - <list> - <tuple> - <string>Business Link</string> - <string>Business Link</string> - </tuple> - </list> - </value> - </item> - <item> - <key> <string>sort</string> </key> - <value> - <list> - <tuple> - <string>int_index</string> - <string>ascending</string> - </tuple> - </list> - </value> - </item> - <item> - <key> <string>target</string> </key> - <value> <string>Click to edit the target</string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Business Links</string> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/listbox_delivery_builder_title_list.xml b/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/listbox_delivery_builder_title_list.xml deleted file mode 100644 index 73128f9761..0000000000 --- a/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/listbox_delivery_builder_title_list.xml +++ /dev/null @@ -1,90 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>delegated_list</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>listbox_delivery_builder_title_list</string> </value> - </item> - <item> - <key> <string>message_values</string> </key> - <value> - <dictionary> - <item> - <key> <string>external_validator_failed</string> </key> - <value> <string>The input failed the external validator.</string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>overrides</string> </key> - <value> - <dictionary> - <item> - <key> <string>field_id</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>form_id</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>target</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>tales</string> </key> - <value> - <dictionary> - <item> - <key> <string>field_id</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>form_id</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>target</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>values</string> </key> - <value> - <dictionary> - <item> - <key> <string>field_id</string> </key> - <value> <string>my_view_mode_listbox_delivery_builder_title_list</string> </value> - </item> - <item> - <key> <string>form_id</string> </key> - <value> <string>Base_viewTradeFieldLibrary</string> </value> - </item> - <item> - <key> <string>target</string> </key> - <value> <string>Click to edit the target</string> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/listbox_int_index.xml b/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/listbox_int_index.xml deleted file mode 100644 index 0e10804225..0000000000 --- a/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/listbox_int_index.xml +++ /dev/null @@ -1,90 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>delegated_list</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>listbox_int_index</string> </value> - </item> - <item> - <key> <string>message_values</string> </key> - <value> - <dictionary> - <item> - <key> <string>external_validator_failed</string> </key> - <value> <string>The input failed the external validator.</string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>overrides</string> </key> - <value> - <dictionary> - <item> - <key> <string>field_id</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>form_id</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>target</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>tales</string> </key> - <value> - <dictionary> - <item> - <key> <string>field_id</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>form_id</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>target</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>values</string> </key> - <value> - <dictionary> - <item> - <key> <string>field_id</string> </key> - <value> <string>my_view_mode_listbox_int_index</string> </value> - </item> - <item> - <key> <string>form_id</string> </key> - <value> <string>Base_viewTradeFieldLibrary</string> </value> - </item> - <item> - <key> <string>target</string> </key> - <value> <string>Click to edit the target</string> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/listbox_order_builder_title_list.xml b/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/listbox_order_builder_title_list.xml deleted file mode 100644 index 2b8e7f7777..0000000000 --- a/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/listbox_order_builder_title_list.xml +++ /dev/null @@ -1,90 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>delegated_list</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>listbox_order_builder_title_list</string> </value> - </item> - <item> - <key> <string>message_values</string> </key> - <value> - <dictionary> - <item> - <key> <string>external_validator_failed</string> </key> - <value> <string>The input failed the external validator.</string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>overrides</string> </key> - <value> - <dictionary> - <item> - <key> <string>field_id</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>form_id</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>target</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>tales</string> </key> - <value> - <dictionary> - <item> - <key> <string>field_id</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>form_id</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>target</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>values</string> </key> - <value> - <dictionary> - <item> - <key> <string>field_id</string> </key> - <value> <string>my_view_mode_listbox_order_builder_title_list</string> </value> - </item> - <item> - <key> <string>form_id</string> </key> - <value> <string>Base_viewTradeFieldLibrary</string> </value> - </item> - <item> - <key> <string>target</string> </key> - <value> <string>Click to edit the target</string> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/my_jsplumb_graph.xml b/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/my_jsplumb_graph.xml index 0e2dbffc02..95d9cdc98f 100644 --- a/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/my_jsplumb_graph.xml +++ b/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/my_jsplumb_graph.xml @@ -227,7 +227,7 @@ </item> <item> <key> <string>gadget_url</string> </key> - <value> <string>dream_graph_editor/jsplumb/index.html</string> </value> + <value> <string>gadget_graph_editor.html</string> </value> </item> <item> <key> <string>hidden</string> </key> @@ -235,7 +235,7 @@ </item> <item> <key> <string>js_sandbox</string> </key> - <value> <string></string> </value> + <value> <string>iframe</string> </value> </item> <item> <key> <string>renderjs_extra</string> </key> @@ -253,11 +253,11 @@ </item> <item> <key> <string>validator_field_id</string> </key> - <value> <string></string> </value> + <value> <string>my_core_mode_text_content_validator</string> </value> </item> <item> <key> <string>validator_form_id</string> </key> - <value> <string></string> </value> + <value> <string>Base_viewFieldLibrary</string> </value> </item> </dictionary> </value> diff --git a/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/my_reference.xml b/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/my_reference.xml index 0bb8ef4f85..4c43247cde 100644 --- a/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/my_reference.xml +++ b/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/my_reference.xml @@ -9,7 +9,9 @@ <item> <key> <string>delegated_list</string> </key> <value> - <list/> + <list> + <string>editable</string> + </list> </value> </item> <item> @@ -69,6 +71,10 @@ <key> <string>values</string> </key> <value> <dictionary> + <item> + <key> <string>editable</string> </key> + <value> <int>0</int> </value> + </item> <item> <key> <string>field_id</string> </key> <value> <string>my_view_mode_reference</string> </value> diff --git a/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/my_title.xml b/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/my_title.xml index 52bff3e19d..03d1a1054c 100644 --- a/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/my_title.xml +++ b/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/my_title.xml @@ -9,7 +9,9 @@ <item> <key> <string>delegated_list</string> </key> <value> - <list/> + <list> + <string>editable</string> + </list> </value> </item> <item> @@ -69,6 +71,10 @@ <key> <string>values</string> </key> <value> <dictionary> + <item> + <key> <string>editable</string> </key> + <value> <int>0</int> </value> + </item> <item> <key> <string>field_id</string> </key> <value> <string>my_view_mode_title</string> </value> -- 2.30.9