From 98d054206b821ec9f028274c4ba98e5004e70a0a Mon Sep 17 00:00:00 2001 From: Yusei Tahara <yusei@nexedi.com> Date: Thu, 29 Nov 2007 17:58:34 +0000 Subject: [PATCH] 2007-11-29 yusei * Membership criteria list in Predicate_view is sorted. Please use revision 17909 or newer version of CMFCategory. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17910 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_core/Predicate_view.xml | 1 - ...y_membership_criterion_base_category_list.xml | 16 +++++----------- ...timembership_criterion_base_category_list.xml | 16 +++++----------- product/ERP5/bootstrap/erp5_core/bt/change_log | 3 +++ product/ERP5/bootstrap/erp5_core/bt/revision | 2 +- 5 files changed, 14 insertions(+), 24 deletions(-) diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view.xml index 86959a9b77..6791da495c 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view.xml @@ -109,7 +109,6 @@ <string>my_string_index</string> <string>my_int_index</string> <string>my_test_method_id</string> - <string>my_membership_criterion_category_list2</string> </list> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view/my_membership_criterion_base_category_list.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view/my_membership_criterion_base_category_list.xml index 710124886a..94a341f2cd 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view/my_membership_criterion_base_category_list.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view/my_membership_criterion_base_category_list.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.StandardFields</string> - <string>MultiListField</string> - </tuple> - <none/> + <global name="MultiListField" module="Products.Formulator.StandardFields"/> + <tuple/> </tuple> </pickle> <pickle> @@ -264,18 +261,15 @@ <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.TALESField</string> - <string>TALESMethod</string> - </tuple> - <none/> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + <tuple/> </tuple> </pickle> <pickle> <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>here/portal_categories/getBaseCategoryList</string> </value> + <value> <string>python:here.portal_categories.getBaseCategoryList(sort=True)</string> </value> </item> </dictionary> </pickle> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view/my_multimembership_criterion_base_category_list.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view/my_multimembership_criterion_base_category_list.xml index 7c5e4e5eea..f1a71ad2e4 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view/my_multimembership_criterion_base_category_list.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view/my_multimembership_criterion_base_category_list.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.StandardFields</string> - <string>MultiListField</string> - </tuple> - <none/> + <global name="MultiListField" module="Products.Formulator.StandardFields"/> + <tuple/> </tuple> </pickle> <pickle> @@ -260,18 +257,15 @@ <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.TALESField</string> - <string>TALESMethod</string> - </tuple> - <none/> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + <tuple/> </tuple> </pickle> <pickle> <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>here/portal_categories/getBaseCategoryList</string> </value> + <value> <string>python:here.portal_categories.getBaseCategoryList(sort=True)</string> </value> </item> </dictionary> </pickle> diff --git a/product/ERP5/bootstrap/erp5_core/bt/change_log b/product/ERP5/bootstrap/erp5_core/bt/change_log index c54606c013..1f7a8443a1 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/change_log +++ b/product/ERP5/bootstrap/erp5_core/bt/change_log @@ -1,3 +1,6 @@ +2007-11-29 yusei +* Membership criteria list in Predicate_view is sorted. Please use revision 17909 or newer version of CMFCategory. + 2007-11-29 yusei * Fixed Predicate_edit to use ignore_layout and editable_mode parameters in redirect url. diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index a7ff3ab009..5aac26524c 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -605 \ No newline at end of file +606 \ No newline at end of file -- 2.30.9