From 0cfd2102e35bb4dfaeeb6464c41a1579464d8f62 Mon Sep 17 00:00:00 2001 From: Romain Courteaud <romain@nexedi.com> Date: Tue, 18 Sep 2007 13:31:08 +0000 Subject: [PATCH] - Use getTrackingList - do not create Item manually in the module - proxify some fields git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16455 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../hidden_content_type_list.xml | 3 + .../workflow_chain_type.xml | 2 +- .../ItemModule_viewItemList/listbox.xml | 453 +++--------------- .../erp5_item/Item_getResourceTitle.xml | 157 ++++++ .../portal_skins/erp5_item/Item_view.xml | 1 + .../erp5_item/Item_view/my_resource_title.xml | 4 + .../my_translated_validation_state_title.xml | 96 ++++ .../erp5_item/Item_viewFieldLibrary.xml | 2 +- .../my_resource_title.xml | 179 +------ bt5/erp5_item/bt/revision | 2 +- ...plate_portal_type_hidden_content_type_list | 1 + .../template_portal_type_workflow_chain_list | 1 + 12 files changed, 331 insertions(+), 570 deletions(-) create mode 100644 bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceTitle.xml create mode 100644 bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_translated_validation_state_title.xml diff --git a/bt5/erp5_item/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml b/bt5/erp5_item/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml index a756a7c11d..44ab96353b 100644 --- a/bt5/erp5_item/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml +++ b/bt5/erp5_item/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml @@ -1,4 +1,7 @@ <hidden_content_type_list> + <portal_type id="Item Module"> + <item>Item</item> + </portal_type> <portal_type id="Service Report Module"> <item>Service Report</item> </portal_type> diff --git a/bt5/erp5_item/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_item/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml index 9a57d51938..e821a27bd9 100644 --- a/bt5/erp5_item/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml +++ b/bt5/erp5_item/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml @@ -1,7 +1,7 @@ <workflow_chain> <chain> <type>Item</type> - <workflow>edit_workflow</workflow> + <workflow>edit_workflow, item_workflow</workflow> </chain> <chain> <type>Service Report</type> diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewItemList/listbox.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewItemList/listbox.xml index a76e0624ad..1657cf8d03 100644 --- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewItemList/listbox.xml +++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewItemList/listbox.xml @@ -4,14 +4,28 @@ <pickle> <tuple> <tuple> - <string>Products.ERP5Form.ListBox</string> - <string>ListBox</string> + <string>Products.ERP5Form.ProxyField</string> + <string>ProxyField</string> </tuple> <none/> </tuple> </pickle> <pickle> <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list> + <string>title</string> + <string>columns</string> + <string>all_columns</string> + <string>search_columns</string> + <string>sort</string> + <string>selection_name</string> + <string>portal_types</string> + </list> + </value> + </item> <item> <key> <string>id</string> </key> <value> <string>listbox</string> </value> @@ -32,135 +46,15 @@ <value> <dictionary> <item> - <key> <string>all_columns</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>all_editable_columns</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>alternate_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>columns</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>css_class</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>default</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>default_params</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>domain_root_list</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>domain_tree</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>editable</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>editable_columns</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>enabled</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>external_validator</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>global_attributes</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>lines</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>list_action</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>list_method</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>meta_types</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>portal_types</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>report_root_list</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>report_tree</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>search</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>search_columns</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>select</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>selection_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>sort</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>sort_columns</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>stat_columns</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>stat_method</string> </key> + <key> <string>field_id</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>form_id</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>url_columns</string> </key> + <key> <string>target</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -171,135 +65,15 @@ <value> <dictionary> <item> - <key> <string>all_columns</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>all_editable_columns</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>alternate_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>columns</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>css_class</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>default</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>default_params</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>domain_root_list</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>domain_tree</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>editable</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>editable_columns</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>enabled</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>external_validator</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>global_attributes</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>lines</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>list_action</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>list_method</string> </key> + <key> <string>field_id</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>meta_types</string> </key> + <key> <string>form_id</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>portal_types</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>report_root_list</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>report_tree</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>search</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>search_columns</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>select</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>selection_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>sort</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>sort_columns</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>stat_columns</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>stat_method</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>url_columns</string> </key> + <key> <string>target</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -310,9 +84,18 @@ <value> <dictionary> <item> - <key> <string>all_columns</string> </key> + <key> <string>all_columns</string> </key> <value> - <list/> + <list> + <tuple> + <string>title</string> + <string>Title</string> + </tuple> + <tuple> + <string>translated_validation_state_title</string> + <string>State</string> + </tuple> + </list> </value> </item> <item> @@ -322,11 +105,7 @@ </value> </item> <item> - <key> <string>alternate_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>columns</string> </key> + <key> <string>columns</string> </key> <value> <list> <tuple> @@ -334,94 +113,22 @@ <string>Title</string> </tuple> <tuple> - <string>resource_title</string> - <string>Resource</string> + <string>translated_validation_state_title</string> + <string>State</string> </tuple> </list> </value> </item> <item> - <key> <string>count_method</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>css_class</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>default</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>default_params</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>domain_root_list</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>domain_tree</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>editable</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>editable_columns</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>enabled</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>external_validator</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>global_attributes</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>lines</string> </key> - <value> <int>30</int> </value> - </item> - <item> - <key> <string>list_action</string> </key> - <value> <string>list</string> </value> - </item> - <item> - <key> <string>list_method</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> + <key> <string>field_id</string> </key> + <value> <string>my_list_mode_listbox</string> </value> </item> <item> - <key> <string>meta_types</string> </key> - <value> - <list/> - </value> + <key> <string>form_id</string> </key> + <value> <string>Base_viewFieldLibrary</string> </value> </item> <item> - <key> <string>portal_types</string> </key> + <key> <string>portal_types</string> </key> <value> <list> <tuple> @@ -432,35 +139,26 @@ </value> </item> <item> - <key> <string>report_root_list</string> </key> + <key> <string>search_columns</string> </key> <value> - <list/> - </value> - </item> - <item> - <key> <string>report_tree</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>search</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>search_columns</string> </key> - <value> - <list/> + <list> + <tuple> + <string>title</string> + <string>Title</string> + </tuple> + <tuple> + <string>translated_validation_state_title</string> + <string>State</string> + </tuple> + </list> </value> </item> <item> - <key> <string>select</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>selection_name</string> </key> + <key> <string>selection_name</string> </key> <value> <string>item_module_selection</string> </value> </item> <item> - <key> <string>sort</string> </key> + <key> <string>sort</string> </key> <value> <list> <tuple> @@ -471,54 +169,17 @@ </value> </item> <item> - <key> <string>sort_columns</string> </key> - <value> - <list/> - </value> + <key> <string>target</string> </key> + <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>stat_columns</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>stat_method</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Items</string> </value> </item> - <item> - <key> <string>url_columns</string> </key> - <value> - <list/> - </value> - </item> </dictionary> </value> </item> </dictionary> </pickle> </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Products.Formulator.MethodField</string> - <string>Method</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>method_name</string> </key> - <value> <string>searchFolder</string> </value> - </item> - </dictionary> - </pickle> - </record> </ZopeData> diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceTitle.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceTitle.xml new file mode 100644 index 0000000000..7c69414a88 --- /dev/null +++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceTitle.xml @@ -0,0 +1,157 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.PythonScripts.PythonScript</string> + <string>PythonScript</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>Python_magic</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>Script_magic</string> </key> + <value> <int>3</int> </value> + </item> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </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>_body</string> </key> + <value> <string>movement_list = context.portal_simulation.getTrackingList(\n + at_date=DateTime(), \n + aggregate_uid=context.getUid()\n +)\n +\n +# movement list should not be empty, as Item should always be created\n +# from movement\n +last_movement = movement_list[0]\n +resource_uid = last_movement.resource_uid\n +return context.portal_catalog(uid=resource_uid)[0].title\n +</string> </value> + </item> + <item> + <key> <string>_code</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_filepath</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_params</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>errors</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>func_code</string> </key> + <value> + <object> + <klass> + <global name="FuncCode" module="Shared.DC.Scripts.Signature"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>co_argcount</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>co_varnames</string> </key> + <value> + <tuple> + <string>_getattr_</string> + <string>context</string> + <string>DateTime</string> + <string>movement_list</string> + <string>_getitem_</string> + <string>last_movement</string> + <string>resource_uid</string> + </tuple> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>func_defaults</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>Item_getResourceTitle</string> </value> + </item> + <item> + <key> <string>warnings</string> </key> + <value> + <tuple/> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view.xml index dfc0ba18cc..77a9895747 100644 --- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view.xml +++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view.xml @@ -109,6 +109,7 @@ <value> <list> <string>my_variation_category_list</string> + <string>my_translated_validation_state_title</string> </list> </value> </item> diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_resource_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_resource_title.xml index d30f4a100f..9e787b7636 100644 --- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_resource_title.xml +++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_resource_title.xml @@ -68,6 +68,10 @@ <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> diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_translated_validation_state_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_translated_validation_state_title.xml new file mode 100644 index 0000000000..56de445dfe --- /dev/null +++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_translated_validation_state_title.xml @@ -0,0 +1,96 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.ERP5Form.ProxyField</string> + <string>ProxyField</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>my_translated_validation_state_title</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_translated_workflow_state_title</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>Base_viewFieldLibrary</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_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary.xml index c9ffce95b3..f9cc48ba75 100644 --- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary.xml +++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary.xml @@ -79,11 +79,11 @@ <list> <string>my_comment</string> <string>my_quantity</string> - <string>my_resource_title</string> <string>my_variation_category_list</string> <string>my_quantity_unit</string> <string>my_description</string> <string>my_title</string> + <string>my_resource_title</string> </list> </value> </item> diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_resource_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_resource_title.xml index 97137c1b0a..d298b96fd0 100644 --- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_resource_title.xml +++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_resource_title.xml @@ -4,8 +4,8 @@ <pickle> <tuple> <tuple> - <string>Products.ERP5Form.RelationField</string> - <string>RelationStringField</string> + <string>Products.Formulator.StandardFields</string> + <string>StringField</string> </tuple> <none/> </tuple> @@ -43,14 +43,6 @@ <key> <string>alternate_name</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>base_category</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>catalog_index</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>css_class</string> </key> <value> <string></string> </value> @@ -59,10 +51,6 @@ <key> <string>default</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>default_module</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>description</string> </key> <value> <string></string> </value> @@ -95,22 +83,10 @@ <key> <string>hidden</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>jump_method</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>max_length</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>portal_type</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>relation_setter_id</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>required</string> </key> <value> <string></string> </value> @@ -127,10 +103,6 @@ <key> <string>unicode</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>update_method</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>whitespace_preserve</string> </key> <value> <string></string> </value> @@ -146,29 +118,15 @@ <key> <string>alternate_name</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>base_category</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>catalog_index</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>columns</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>css_class</string> </key> <value> <string></string> </value> </item> <item> <key> <string>default</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>default_module</string> </key> - <value> <string></string> </value> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> </item> <item> <key> <string>description</string> </key> @@ -198,60 +156,18 @@ <key> <string>extra</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>extra_item</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>first_item</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>hidden</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>items</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>jump_method</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>list_method</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>max_length</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>parameter_list</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>portal_type</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>relation_setter_id</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>required</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>size</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>sort</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>title</string> </key> <value> <string></string> </value> @@ -264,10 +180,6 @@ <key> <string>unicode</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>update_method</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>whitespace_preserve</string> </key> <value> <string></string> </value> @@ -283,20 +195,6 @@ <key> <string>alternate_name</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>base_category</string> </key> - <value> <string>resource</string> </value> - </item> - <item> - <key> <string>catalog_index</string> </key> - <value> <string>title</string> </value> - </item> - <item> - <key> <string>columns</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>css_class</string> </key> <value> <string></string> </value> @@ -305,10 +203,6 @@ <key> <string>default</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>default_module</string> </key> - <value> <string>resource_module</string> </value> - </item> <item> <key> <string>description</string> </key> <value> <string></string> </value> @@ -319,11 +213,11 @@ </item> <item> <key> <string>display_width</string> </key> - <value> <int>40</int> </value> + <value> <int>20</int> </value> </item> <item> <key> <string>editable</string> </key> - <value> <int>1</int> </value> + <value> <int>0</int> </value> </item> <item> <key> <string>enabled</string> </key> @@ -337,71 +231,18 @@ <key> <string>extra</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>extra_item</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>first_item</string> </key> - <value> <int>0</int> </value> - </item> <item> <key> <string>hidden</string> </key> <value> <int>0</int> </value> </item> - <item> - <key> <string>items</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>jump_method</string> </key> - <value> <string>Base_jumpToRelatedDocument</string> </value> - </item> - <item> - <key> <string>list_method</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>max_length</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>parameter_list</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>portal_type</string> </key> - <value> - <list> - <tuple> - <string>Apparel Fabric</string> - <string>Apparel Fabric</string> - </tuple> - </list> - </value> - </item> - <item> - <key> <string>relation_setter_id</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>required</string> </key> <value> <int>0</int> </value> </item> - <item> - <key> <string>size</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>sort</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>title</string> </key> <value> <string>Resource</string> </value> @@ -414,10 +255,6 @@ <key> <string>unicode</string> </key> <value> <int>0</int> </value> </item> - <item> - <key> <string>update_method</string> </key> - <value> <string>Base_validateRelation</string> </value> - </item> <item> <key> <string>whitespace_preserve</string> </key> <value> <int>0</int> </value> @@ -442,7 +279,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>REQUEST/relation_item_list</string> </value> + <value> <string>python: here.Item_getResourceTitle()</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_item/bt/revision b/bt5/erp5_item/bt/revision index 25bf17fc5a..2edeafb09d 100644 --- a/bt5/erp5_item/bt/revision +++ b/bt5/erp5_item/bt/revision @@ -1 +1 @@ -18 \ No newline at end of file +20 \ No newline at end of file diff --git a/bt5/erp5_item/bt/template_portal_type_hidden_content_type_list b/bt5/erp5_item/bt/template_portal_type_hidden_content_type_list index 7190865f28..1f41fa969f 100644 --- a/bt5/erp5_item/bt/template_portal_type_hidden_content_type_list +++ b/bt5/erp5_item/bt/template_portal_type_hidden_content_type_list @@ -1 +1,2 @@ +Item Module | Item Service Report Module | Service Report \ No newline at end of file diff --git a/bt5/erp5_item/bt/template_portal_type_workflow_chain_list b/bt5/erp5_item/bt/template_portal_type_workflow_chain_list index 1b47d55e83..55a6a0f803 100644 --- a/bt5/erp5_item/bt/template_portal_type_workflow_chain_list +++ b/bt5/erp5_item/bt/template_portal_type_workflow_chain_list @@ -1,3 +1,4 @@ Item | edit_workflow +Item | item_workflow Service Report | edit_workflow Service Report | item_workflow \ No newline at end of file -- 2.30.9