From 54bdfb59765b331725d206a75a19bccf214e9381 Mon Sep 17 00:00:00 2001 From: Thierry Brettnacher <tb@nexedi.com> Date: Mon, 17 Sep 2007 15:21:39 +0000 Subject: [PATCH] 2007-09-17 Thierry * Manage sort order in category listfields for Persons and Organisations git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16421 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../Address_viewFieldLibrary/my_region.xml | 8 ++++---- .../erp5_base/Career_getFunctionItemList.xml | 4 ++-- .../Career_viewFieldLibrary/my_activity.xml | 8 ++++---- .../my_product_line_list.xml | 16 ++++++++++------ .../my_activity.xml | 7 ------- .../my_function.xml | 17 +++++------------ .../Organisation_viewFieldLibrary/my_group.xml | 7 ------- .../Organisation_viewFieldLibrary/my_site.xml | 7 ------- .../my_skill_list.xml | 11 ++--------- .../my_social_form.xml | 13 +++---------- .../erp5_base/Person_view/my_gender.xml | 7 ------- .../erp5_base/Person_view/my_nationality.xml | 7 ------- .../Person_viewFieldLibrary/my_gender.xml | 17 +++++------------ .../my_marital_status.xml | 13 +++---------- .../Person_viewFieldLibrary/my_nationality.xml | 11 ++--------- bt5/erp5_base/bt/revision | 2 +- 16 files changed, 41 insertions(+), 114 deletions(-) diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_region.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_region.xml index 36a7490874..7f74c4197b 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_region.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_region.xml @@ -94,7 +94,7 @@ <value> <dictionary> <item> - <key> <string>description</string> </key> + <key> <string>description</string> </key> <value> <string>The region.</string> </value> </item> <item> @@ -106,7 +106,7 @@ <value> <string>Base_viewFieldLibrary</string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <list/> </value> @@ -116,7 +116,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Region</string> </value> </item> </dictionary> @@ -139,7 +139,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: getattr(context.portal_categories.region, preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))()</string> </value> + <value> <string>python: getattr(context.portal_categories.region, preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id="int_index")</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_getFunctionItemList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_getFunctionItemList.xml index 0450b9fc4a..44d5f77677 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_getFunctionItemList.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_getFunctionItemList.xml @@ -84,11 +84,11 @@ if context.getSubordination():\n if subordination_value is not None:\n function_value = subordination_value.getFunctionValue()\n if function_value is not None:\n - result.extend(getattr(function_value, category_child_item_list_method_id)(filter_node=1))\n + result.extend(getattr(function_value, category_child_item_list_method_id)(filter_node=1,local_sort_id="int_index"))\n \n result.extend(getattr(\n portal.portal_categories.function,\n - category_child_item_list_method_id)(filter_node=1))\n + category_child_item_list_method_id)(filter_node=1,local_sort_id="int_index"))\n \n return result\n </string> </value> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_activity.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_activity.xml index 543e92d463..862be3b3c2 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_activity.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_activity.xml @@ -94,7 +94,7 @@ <value> <dictionary> <item> - <key> <string>description</string> </key> + <key> <string>description</string> </key> <value> <string>The activity of the person.</string> </value> </item> <item> @@ -106,7 +106,7 @@ <value> <string>Base_viewFieldLibrary</string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <list/> </value> @@ -116,7 +116,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Activity</string> </value> </item> </dictionary> @@ -139,7 +139,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: getattr(context.portal_categories.activity, preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))()</string> </value> + <value> <string>python: getattr(here.portal_categories.activity, preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id="int_index")</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_product_line_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_product_line_list.xml index fdd71b69fb..dc8cb3dd7f 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_product_line_list.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_product_line_list.xml @@ -60,6 +60,10 @@ <key> <string>tales</string> </key> <value> <dictionary> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>field_id</string> </key> <value> <string></string> </value> @@ -69,7 +73,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> @@ -79,7 +83,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -90,7 +94,7 @@ <value> <dictionary> <item> - <key> <string>description</string> </key> + <key> <string>description</string> </key> <value> <string>Products the person is interested in.</string> </value> </item> <item> @@ -102,7 +106,7 @@ <value> <string>Base_viewFieldLibrary</string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <list/> </value> @@ -112,7 +116,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Product Interest</string> </value> </item> </dictionary> @@ -135,7 +139,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: getattr(context.portal_categories.product_line, preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))()</string> </value> + <value> <string>python: getattr(context.portal_categories.product_line, preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id="int_index")</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_activity.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_activity.xml index 62cfc23bd8..b834a812c3 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_activity.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_activity.xml @@ -18,7 +18,6 @@ <list> <string>title</string> <string>description</string> - <string>items</string> </list> </value> </item> @@ -101,12 +100,6 @@ <key> <string>form_id</string> </key> <value> <string>Base_viewFieldLibrary</string> </value> </item> - <item> - <key> <string>items</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_function.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_function.xml index 591620b907..3d61f4baed 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_function.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_function.xml @@ -18,7 +18,6 @@ <list> <string>title</string> <string>description</string> - <string>items</string> </list> </value> </item> @@ -61,7 +60,7 @@ <value> <dictionary> <item> - <key> <string>description</string> </key> + <key> <string>description</string> </key> <value> <string></string> </value> </item> <item> @@ -73,7 +72,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> @@ -83,7 +82,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -94,7 +93,7 @@ <value> <dictionary> <item> - <key> <string>description</string> </key> + <key> <string>description</string> </key> <value> <string>The function of the organisation.</string> </value> </item> <item> @@ -105,18 +104,12 @@ <key> <string>form_id</string> </key> <value> <string>Base_viewFieldLibrary</string> </value> </item> - <item> - <key> <string>items</string> </key> - <value> - <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> + <key> <string>title</string> </key> <value> <string>Function</string> </value> </item> </dictionary> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_group.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_group.xml index 8223251c90..eded1d0a3e 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_group.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_group.xml @@ -18,7 +18,6 @@ <list> <string>title</string> <string>description</string> - <string>items</string> </list> </value> </item> @@ -105,12 +104,6 @@ <key> <string>form_id</string> </key> <value> <string>Base_viewFieldLibrary</string> </value> </item> - <item> - <key> <string>items</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_site.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_site.xml index fd6f3722af..adb010ba4a 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_site.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_site.xml @@ -18,7 +18,6 @@ <list> <string>title</string> <string>description</string> - <string>items</string> </list> </value> </item> @@ -101,12 +100,6 @@ <key> <string>form_id</string> </key> <value> <string>Base_viewFieldLibrary</string> </value> </item> - <item> - <key> <string>items</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_skill_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_skill_list.xml index 0c85c80e6e..a996bf0b6a 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_skill_list.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_skill_list.xml @@ -17,7 +17,6 @@ <value> <list> <string>title</string> - <string>items</string> </list> </value> </item> @@ -68,7 +67,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> @@ -78,7 +77,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -96,12 +95,6 @@ <key> <string>form_id</string> </key> <value> <string>Base_viewFieldLibrary</string> </value> </item> - <item> - <key> <string>items</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_social_form.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_social_form.xml index b6773d6533..b686c6c5f7 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_social_form.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_social_form.xml @@ -17,7 +17,6 @@ <value> <list> <string>title</string> - <string>items</string> </list> </value> </item> @@ -68,7 +67,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> @@ -78,7 +77,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -96,18 +95,12 @@ <key> <string>form_id</string> </key> <value> <string>Base_viewFieldLibrary</string> </value> </item> - <item> - <key> <string>items</string> </key> - <value> - <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> + <key> <string>title</string> </key> <value> <string>Social Form</string> </value> </item> </dictionary> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_gender.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_gender.xml index 2500ac10b4..e87dff84db 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_gender.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_gender.xml @@ -18,7 +18,6 @@ <list> <string>title</string> <string>description</string> - <string>items</string> </list> </value> </item> @@ -97,12 +96,6 @@ <key> <string>form_id</string> </key> <value> <string>Person_viewFieldLibrary</string> </value> </item> - <item> - <key> <string>items</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_nationality.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_nationality.xml index caf1a49e2e..c596f495de 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_nationality.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_nationality.xml @@ -18,7 +18,6 @@ <list> <string>title</string> <string>description</string> - <string>items</string> </list> </value> </item> @@ -101,12 +100,6 @@ <key> <string>form_id</string> </key> <value> <string>Person_viewFieldLibrary</string> </value> </item> - <item> - <key> <string>items</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_gender.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_gender.xml index bcdb37d253..a0cc1f446d 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_gender.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_gender.xml @@ -18,7 +18,6 @@ <list> <string>title</string> <string>description</string> - <string>items</string> </list> </value> </item> @@ -61,7 +60,7 @@ <value> <dictionary> <item> - <key> <string>description</string> </key> + <key> <string>description</string> </key> <value> <string></string> </value> </item> <item> @@ -73,7 +72,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> @@ -83,7 +82,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -94,7 +93,7 @@ <value> <dictionary> <item> - <key> <string>description</string> </key> + <key> <string>description</string> </key> <value> <string>The person\'s gender.</string> </value> </item> <item> @@ -105,18 +104,12 @@ <key> <string>form_id</string> </key> <value> <string>Base_viewFieldLibrary</string> </value> </item> - <item> - <key> <string>items</string> </key> - <value> - <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> + <key> <string>title</string> </key> <value> <string>Gender</string> </value> </item> </dictionary> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_marital_status.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_marital_status.xml index c0c56354e4..936171bc85 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_marital_status.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_marital_status.xml @@ -18,7 +18,6 @@ <list> <string>title</string> <string>description</string> - <string>items</string> </list> </value> </item> @@ -61,7 +60,7 @@ <value> <dictionary> <item> - <key> <string>description</string> </key> + <key> <string>description</string> </key> <value> <string></string> </value> </item> <item> @@ -73,7 +72,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> @@ -83,7 +82,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -105,12 +104,6 @@ <key> <string>form_id</string> </key> <value> <string>Base_viewFieldLibrary</string> </value> </item> - <item> - <key> <string>items</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_nationality.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_nationality.xml index ae5f5158b8..5c0bd42460 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_nationality.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_nationality.xml @@ -18,7 +18,6 @@ <list> <string>title</string> <string>description</string> - <string>items</string> </list> </value> </item> @@ -69,7 +68,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> @@ -79,7 +78,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -101,12 +100,6 @@ <key> <string>form_id</string> </key> <value> <string>Base_viewFieldLibrary</string> </value> </item> - <item> - <key> <string>items</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision index cbd6012bc6..e0d1ea1e9a 100644 --- a/bt5/erp5_base/bt/revision +++ b/bt5/erp5_base/bt/revision @@ -1 +1 @@ -204 \ No newline at end of file +205 \ No newline at end of file -- 2.30.9