From 40b6355d30acdc991c777faf5821f2fff6c52b08 Mon Sep 17 00:00:00 2001 From: Ayush Tiwari <ayush.tiwari@nexedi.com> Date: Mon, 27 Nov 2017 11:51:33 +0100 Subject: [PATCH] [erp5_core]: Catalog listbox should be in view_mode and not list_mode This follows the guidelines and also make it feasible to go to listbox to search or make changes in sub-object list. Also, - Add 'More columns' in listbox for viewing Catalog Method list. - Add title field in listbox view for Catalog content and Catalog Filter List - Fixup links on these views which were not consistent. --- .../erp5_core/Catalog_viewContentList.xml | 4 +- .../Catalog_viewContentList/listbox.xml | 50 ++++++++--- .../Catalog_viewContentList/my_title.xml | 89 +++++++++++++++++++ .../Catalog_viewFilterableMethodList.xml | 4 +- .../listbox.xml | 39 ++++---- .../my_title.xml | 89 +++++++++++++++++++ 6 files changed, 238 insertions(+), 37 deletions(-) create mode 100644 product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Catalog_viewContentList/my_title.xml create mode 100644 product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Catalog_viewFilterableMethodList/my_title.xml diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Catalog_viewContentList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Catalog_viewContentList.xml index 35545c5e1d..9699032d13 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Catalog_viewContentList.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Catalog_viewContentList.xml @@ -51,7 +51,9 @@ <item> <key> <string>center</string> </key> <value> - <list/> + <list> + <string>my_title</string> + </list> </value> </item> <item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Catalog_viewContentList/listbox.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Catalog_viewContentList/listbox.xml index c6bdabb008..781bbf257e 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Catalog_viewContentList/listbox.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Catalog_viewContentList/listbox.xml @@ -10,6 +10,7 @@ <key> <string>delegated_list</string> </key> <value> <list> + <string>all_columns</string> <string>columns</string> <string>count_method</string> <string>lines</string> @@ -84,7 +85,9 @@ </item> <item> <key> <string>url_columns</string> </key> - <value> <string></string> </value> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> </item> </dictionary> </value> @@ -93,6 +96,21 @@ <key> <string>values</string> </key> <value> <dictionary> + <item> + <key> <string>all_columns</string> </key> + <value> + <list> + <tuple> + <string>creation_date</string> + <string>Creation Date</string> + </tuple> + <tuple> + <string>modification_date</string> + <string>Modification Date</string> + </tuple> + </list> + </value> + </item> <item> <key> <string>columns</string> </key> <value> @@ -105,6 +123,10 @@ <string>id</string> <string>ID</string> </tuple> + <tuple> + <string>translated_portal_type</string> + <string>Type</string> + </tuple> </list> </value> </item> @@ -114,7 +136,7 @@ </item> <item> <key> <string>field_id</string> </key> - <value> <string>my_list_mode_listbox</string> </value> + <value> <string>my_view_mode_listbox</string> </value> </item> <item> <key> <string>form_id</string> </key> @@ -141,16 +163,7 @@ <item> <key> <string>url_columns</string> </key> <value> - <list> - <tuple> - <string>id</string> - <string></string> - </tuple> - <tuple> - <string>title</string> - <string>Catalog_getObjectViewUrl</string> - </tuple> - </list> + <list/> </value> </item> </dictionary> @@ -160,6 +173,19 @@ </pickle> </record> <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python: [(column_id, \'Catalog_getObjectViewUrl\') for column_id, _ in field.get_value(\'columns\')]</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> <pickle> <global name="Method" module="Products.Formulator.MethodField"/> </pickle> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Catalog_viewContentList/my_title.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Catalog_viewContentList/my_title.xml new file mode 100644 index 0000000000..ed88b04ea8 --- /dev/null +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Catalog_viewContentList/my_title.xml @@ -0,0 +1,89 @@ +<?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>editable</string> + <string>title</string> + </list> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>my_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> + </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> + </dictionary> + </value> + </item> + <item> + <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_string_field</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>Base_viewFieldLibrary</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Title</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Catalog_viewFilterableMethodList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Catalog_viewFilterableMethodList.xml index 1c0ab6cb99..91bcf33bfc 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Catalog_viewFilterableMethodList.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Catalog_viewFilterableMethodList.xml @@ -61,7 +61,9 @@ <item> <key> <string>center</string> </key> <value> - <list/> + <list> + <string>my_title</string> + </list> </value> </item> <item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Catalog_viewFilterableMethodList/listbox.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Catalog_viewFilterableMethodList/listbox.xml index c23df54efe..ce70ff6bab 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Catalog_viewFilterableMethodList/listbox.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Catalog_viewFilterableMethodList/listbox.xml @@ -59,6 +59,10 @@ <key> <string>columns</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>count_method</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>editable_columns</string> </key> <value> <string></string> </value> @@ -87,12 +91,6 @@ <key> <string>title</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>url_columns</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> </dictionary> </value> </item> @@ -120,6 +118,10 @@ <string>expression_cache_key</string> <string>Expression Key</string> </tuple> + <tuple> + <string>translated_portal_type</string> + <string>Type</string> + </tuple> </list> </value> </item> @@ -148,7 +150,7 @@ </item> <item> <key> <string>field_id</string> </key> - <value> <string>my_list_mode_listbox</string> </value> + <value> <string>my_view_mode_listbox</string> </value> </item> <item> <key> <string>form_id</string> </key> @@ -161,7 +163,7 @@ <item> <key> <string>list_method</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> @@ -172,7 +174,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Filter</string> </value> + <value> <string>Filter Methods</string> </value> </item> <item> <key> <string>url_columns</string> </key> @@ -180,7 +182,11 @@ <list> <tuple> <string>id</string> - <string>ID</string> + <string>Catalog_getObjectViewUrl</string> + </tuple> + <tuple> + <string>translated_portal_type</string> + <string></string> </tuple> </list> </value> @@ -192,19 +198,6 @@ </pickle> </record> <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <global name="TALESMethod" module="Products.Formulator.TALESField"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_text</string> </key> - <value> <string>python: [(\'id\', \'Catalog_getObjectViewUrl\'),]</string> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="3" aka="AAAAAAAAAAM="> <pickle> <global name="Method" module="Products.Formulator.MethodField"/> </pickle> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Catalog_viewFilterableMethodList/my_title.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Catalog_viewFilterableMethodList/my_title.xml new file mode 100644 index 0000000000..ed88b04ea8 --- /dev/null +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Catalog_viewFilterableMethodList/my_title.xml @@ -0,0 +1,89 @@ +<?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>editable</string> + <string>title</string> + </list> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>my_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> + </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> + </dictionary> + </value> + </item> + <item> + <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_string_field</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>Base_viewFieldLibrary</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Title</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> -- 2.30.9