From cfa45948cf9015d3e7aff8cef86203d4f9d2d299 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Mon, 18 May 2009 07:42:45 +0000 Subject: [PATCH] Bugfix and cleanup of listbox configurations. * use my_list_mode_listbox instead of my_view_mode_listbox in WebPageModule_viewWebPageList/listbox and WebSiteModule_viewWebSiteList/listbox. * fix count_method WebSection_viewAsWeb/listbox and WebSection_viewContent/listbox. * fix selection_name in WebPage_viewContentList/listbox, WebSite_view/listbox and WebSite_viewSite/listbox. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27009 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../WebPageModule_viewWebPageList/listbox.xml | 71 ++----------------- .../WebPage_viewContentList/listbox.xml | 40 ++--------- .../erp5_web/WebSection_viewAsWeb/listbox.xml | 15 ++-- .../WebSection_viewContent/listbox.xml | 13 ++-- .../WebSiteModule_viewWebSiteList/listbox.xml | 69 +----------------- .../erp5_web/WebSite_view/listbox.xml | 8 +-- .../erp5_web/WebSite_viewSite/listbox.xml | 8 +-- bt5/erp5_web/bt/revision | 2 +- 8 files changed, 40 insertions(+), 186 deletions(-) diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPageModule_viewWebPageList/listbox.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPageModule_viewWebPageList/listbox.xml index b14008d009..0aade78a4c 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPageModule_viewWebPageList/listbox.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPageModule_viewWebPageList/listbox.xml @@ -13,17 +13,12 @@ <key> <string>delegated_list</string> </key> <value> <list> - <string>domain_root_list</string> <string>title</string> - <string>select</string> - <string>selection_name</string> + <string>lines</string> <string>columns</string> - <string>count_method</string> - <string>default_params</string> - <string>list_method</string> + <string>selection_name</string> <string>domain_tree</string> - <string>search</string> - <string>lines</string> + <string>domain_root_list</string> </list> </value> </item> @@ -127,18 +122,6 @@ </list> </value> </item> - <item> - <key> <string>count_method</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>default_params</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>domain_root_list</string> </key> <value> @@ -156,7 +139,7 @@ </item> <item> <key> <string>field_id</string> </key> - <value> <string>my_view_mode_listbox</string> </value> + <value> <string>my_list_mode_listbox</string> </value> </item> <item> <key> <string>form_id</string> </key> @@ -166,20 +149,6 @@ <key> <string>lines</string> </key> <value> <int>30</int> </value> </item> - <item> - <key> <string>list_method</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> - </value> - </item> - <item> - <key> <string>search</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>select</string> </key> - <value> <int>1</int> </value> - </item> <item> <key> <string>selection_name</string> </key> <value> <string>web_page_module_view_web_page_list_selection</string> </value> @@ -198,36 +167,4 @@ </dictionary> </pickle> </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <global name="Method" module="Products.Formulator.MethodField"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>method_name</string> </key> - <value> <string>countFolder</string> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="3" aka="AAAAAAAAAAM="> - <pickle> - <tuple> - <global name="Method" module="Products.Formulator.MethodField"/> - <tuple/> - </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_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_viewContentList/listbox.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_viewContentList/listbox.xml index 2bb77da2e6..54770c34bd 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_viewContentList/listbox.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_viewContentList/listbox.xml @@ -13,15 +13,13 @@ <key> <string>delegated_list</string> </key> <value> <list> - <string>editable_columns</string> <string>title</string> - <string>selection_name</string> - <string>columns</string> - <string>default_params</string> - <string>list_method</string> <string>lines</string> - <string>list_action</string> + <string>columns</string> + <string>selection_name</string> <string>portal_types</string> + <string>editable_columns</string> + <string>list_action</string> </list> </value> </item> @@ -109,12 +107,6 @@ </list> </value> </item> - <item> - <key> <string>default_params</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>editable_columns</string> </key> <value> @@ -146,12 +138,6 @@ <key> <string>list_action</string> </key> <value> <string>Folder_viewContentList</string> </value> </item> - <item> - <key> <string>list_method</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> <item> <key> <string>portal_types</string> </key> <value> @@ -169,7 +155,7 @@ </item> <item> <key> <string>selection_name</string> </key> - <value> <string>category_view_selection</string> </value> + <value> <string>page_content_selection</string> </value> </item> <item> <key> <string>target</string> </key> @@ -185,20 +171,4 @@ </dictionary> </pickle> </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <global name="Method" module="Products.Formulator.MethodField"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>method_name</string> </key> - <value> <string>objectValues</string> </value> - </item> - </dictionary> - </pickle> - </record> </ZopeData> diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_viewAsWeb/listbox.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_viewAsWeb/listbox.xml index 7ce1c7a8c7..bec3e8bf8f 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_viewAsWeb/listbox.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_viewAsWeb/listbox.xml @@ -13,16 +13,17 @@ <key> <string>delegated_list</string> </key> <value> <list> - <string>editable_columns</string> <string>title</string> - <string>select</string> - <string>selection_name</string> + <string>lines</string> <string>columns</string> <string>sort</string> <string>list_method</string> - <string>search</string> - <string>lines</string> + <string>count_method</string> + <string>selection_name</string> <string>portal_types</string> + <string>search</string> + <string>select</string> + <string>editable_columns</string> </list> </value> </item> @@ -102,6 +103,10 @@ </list> </value> </item> + <item> + <key> <string>count_method</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>editable_columns</string> </key> <value> diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_viewContent/listbox.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_viewContent/listbox.xml index 8a1e192d0c..49f304f747 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_viewContent/listbox.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_viewContent/listbox.xml @@ -13,15 +13,16 @@ <key> <string>delegated_list</string> </key> <value> <list> - <string>editable_columns</string> <string>title</string> - <string>select</string> - <string>selection_name</string> <string>columns</string> <string>sort</string> <string>list_method</string> - <string>search</string> + <string>count_method</string> + <string>selection_name</string> <string>portal_types</string> + <string>search</string> + <string>select</string> + <string>editable_columns</string> </list> </value> </item> @@ -113,6 +114,10 @@ </list> </value> </item> + <item> + <key> <string>count_method</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>editable_columns</string> </key> <value> diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSiteModule_viewWebSiteList/listbox.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSiteModule_viewWebSiteList/listbox.xml index ab9c1ebceb..ffce1d83ba 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSiteModule_viewWebSiteList/listbox.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSiteModule_viewWebSiteList/listbox.xml @@ -14,15 +14,10 @@ <value> <list> <string>title</string> - <string>select</string> - <string>selection_name</string> + <string>lines</string> <string>columns</string> - <string>count_method</string> - <string>default_params</string> - <string>list_method</string> + <string>selection_name</string> <string>domain_tree</string> - <string>search</string> - <string>lines</string> </list> </value> </item> @@ -106,25 +101,13 @@ </list> </value> </item> - <item> - <key> <string>count_method</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>default_params</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>domain_tree</string> </key> <value> <int>1</int> </value> </item> <item> <key> <string>field_id</string> </key> - <value> <string>my_view_mode_listbox</string> </value> + <value> <string>my_list_mode_listbox</string> </value> </item> <item> <key> <string>form_id</string> </key> @@ -134,20 +117,6 @@ <key> <string>lines</string> </key> <value> <int>30</int> </value> </item> - <item> - <key> <string>list_method</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> - </value> - </item> - <item> - <key> <string>search</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>select</string> </key> - <value> <int>1</int> </value> - </item> <item> <key> <string>selection_name</string> </key> <value> <string>web_site_module_view_web_site_list_selection</string> </value> @@ -166,36 +135,4 @@ </dictionary> </pickle> </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <global name="Method" module="Products.Formulator.MethodField"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>method_name</string> </key> - <value> <string>countFolder</string> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="3" aka="AAAAAAAAAAM="> - <pickle> - <tuple> - <global name="Method" module="Products.Formulator.MethodField"/> - <tuple/> - </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_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_view/listbox.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_view/listbox.xml index 4ed43d5e4c..026fb626ab 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_view/listbox.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_view/listbox.xml @@ -14,11 +14,11 @@ <value> <list> <string>title</string> - <string>selection_name</string> - <string>columns</string> <string>lines</string> - <string>list_action</string> + <string>columns</string> + <string>selection_name</string> <string>portal_types</string> + <string>list_action</string> </list> </value> </item> @@ -139,7 +139,7 @@ </item> <item> <key> <string>selection_name</string> </key> - <value> <string>category_view_selection</string> </value> + <value> <string>site_content_selection</string> </value> </item> <item> <key> <string>target</string> </key> diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewSite/listbox.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewSite/listbox.xml index 4ed43d5e4c..026fb626ab 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewSite/listbox.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewSite/listbox.xml @@ -14,11 +14,11 @@ <value> <list> <string>title</string> - <string>selection_name</string> - <string>columns</string> <string>lines</string> - <string>list_action</string> + <string>columns</string> + <string>selection_name</string> <string>portal_types</string> + <string>list_action</string> </list> </value> </item> @@ -139,7 +139,7 @@ </item> <item> <key> <string>selection_name</string> </key> - <value> <string>category_view_selection</string> </value> + <value> <string>site_content_selection</string> </value> </item> <item> <key> <string>target</string> </key> diff --git a/bt5/erp5_web/bt/revision b/bt5/erp5_web/bt/revision index 233a64e672..8e44f67f05 100644 --- a/bt5/erp5_web/bt/revision +++ b/bt5/erp5_web/bt/revision @@ -1 +1 @@ -811 \ No newline at end of file +812 \ No newline at end of file -- 2.30.9