From 1efdbba0a39ea93f1e4fe6252c604f04a45ad6dc Mon Sep 17 00:00:00 2001 From: Sebastien Robin <seb@nexedi.com> Date: Mon, 10 May 2010 09:46:12 +0000 Subject: [PATCH] 2010-05-10 Seb * use more the my_view_mode_category in order to share complex tales expression (thanks Yusei for suggestion) git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35126 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../my_view_mode_activity.xml | 25 +------------------ .../my_view_mode_end_of.xml | 25 +------------------ .../my_view_mode_group.xml | 25 +------------------ .../my_view_mode_incoterm.xml | 25 +------------------ .../my_view_mode_order.xml | 25 +------------------ .../my_view_mode_origin.xml | 25 +------------------ .../my_view_mode_payment_mode.xml | 18 +++++++++++-- bt5/erp5_trade/bt/revision | 2 +- 8 files changed, 23 insertions(+), 147 deletions(-) diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_activity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_activity.xml index 95c8229fc2..83200666d8 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_activity.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_activity.xml @@ -14,7 +14,6 @@ <value> <list> <string>title</string> - <string>items</string> </list> </value> </item> @@ -64,12 +63,6 @@ <key> <string>form_id</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>target</string> </key> <value> <string></string> </value> @@ -83,7 +76,7 @@ <dictionary> <item> <key> <string>field_id</string> </key> - <value> <string>my_list_field</string> </value> + <value> <string>my_view_mode_category</string> </value> </item> <item> <key> <string>form_id</string> </key> @@ -103,20 +96,4 @@ </dictionary> </pickle> </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <global name="TALESMethod" module="Products.Formulator.TALESField"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_text</string> </key> - <value> <string>python: getattr(here.portal_categories[field.getId().replace(\'my_\', \'\', 1)], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value> - </item> - </dictionary> - </pickle> - </record> </ZopeData> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_end_of.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_end_of.xml index 6e0a63e90c..4bfe97165b 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_end_of.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_end_of.xml @@ -14,7 +14,6 @@ <value> <list> <string>title</string> - <string>items</string> </list> </value> </item> @@ -64,12 +63,6 @@ <key> <string>form_id</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>target</string> </key> <value> <string></string> </value> @@ -83,7 +76,7 @@ <dictionary> <item> <key> <string>field_id</string> </key> - <value> <string>my_list_field</string> </value> + <value> <string>my_view_mode_category</string> </value> </item> <item> <key> <string>form_id</string> </key> @@ -103,20 +96,4 @@ </dictionary> </pickle> </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <global name="TALESMethod" module="Products.Formulator.TALESField"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_text</string> </key> - <value> <string>python: getattr(here.portal_categories[field.getId().replace(\'my_\', \'\', 1)], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value> - </item> - </dictionary> - </pickle> - </record> </ZopeData> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_group.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_group.xml index be80ad8d63..9c2d84757e 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_group.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_group.xml @@ -14,7 +14,6 @@ <value> <list> <string>title</string> - <string>items</string> </list> </value> </item> @@ -64,12 +63,6 @@ <key> <string>form_id</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>target</string> </key> <value> <string></string> </value> @@ -83,7 +76,7 @@ <dictionary> <item> <key> <string>field_id</string> </key> - <value> <string>my_list_field</string> </value> + <value> <string>my_view_mode_category</string> </value> </item> <item> <key> <string>form_id</string> </key> @@ -103,20 +96,4 @@ </dictionary> </pickle> </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <global name="TALESMethod" module="Products.Formulator.TALESField"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_text</string> </key> - <value> <string>python: getattr(here.portal_categories[field.getId().replace(\'my_\', \'\', 1)], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value> - </item> - </dictionary> - </pickle> - </record> </ZopeData> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_incoterm.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_incoterm.xml index 496dd47ac6..b793d506af 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_incoterm.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_incoterm.xml @@ -14,7 +14,6 @@ <value> <list> <string>title</string> - <string>items</string> </list> </value> </item> @@ -64,12 +63,6 @@ <key> <string>form_id</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>target</string> </key> <value> <string></string> </value> @@ -83,7 +76,7 @@ <dictionary> <item> <key> <string>field_id</string> </key> - <value> <string>my_list_field</string> </value> + <value> <string>my_view_mode_category</string> </value> </item> <item> <key> <string>form_id</string> </key> @@ -103,20 +96,4 @@ </dictionary> </pickle> </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <global name="TALESMethod" module="Products.Formulator.TALESField"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_text</string> </key> - <value> <string>python: getattr(here.portal_categories[field.getId().replace(\'my_\', \'\', 1)], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value> - </item> - </dictionary> - </pickle> - </record> </ZopeData> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_order.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_order.xml index 8aeb29d302..3b55bee11d 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_order.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_order.xml @@ -14,7 +14,6 @@ <value> <list> <string>title</string> - <string>items</string> </list> </value> </item> @@ -64,12 +63,6 @@ <key> <string>form_id</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>target</string> </key> <value> <string></string> </value> @@ -83,7 +76,7 @@ <dictionary> <item> <key> <string>field_id</string> </key> - <value> <string>my_list_field</string> </value> + <value> <string>my_view_mode_category</string> </value> </item> <item> <key> <string>form_id</string> </key> @@ -103,20 +96,4 @@ </dictionary> </pickle> </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <global name="TALESMethod" module="Products.Formulator.TALESField"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_text</string> </key> - <value> <string>python: getattr(here.portal_categories[field.getId().replace(\'my_\', \'\', 1)], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value> - </item> - </dictionary> - </pickle> - </record> </ZopeData> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_origin.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_origin.xml index 31c0907a4d..1376a6c593 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_origin.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_origin.xml @@ -14,7 +14,6 @@ <value> <list> <string>title</string> - <string>items</string> <string>enabled</string> </list> </value> @@ -71,12 +70,6 @@ <key> <string>form_id</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>items</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> - </value> - </item> <item> <key> <string>target</string> </key> <value> <string></string> </value> @@ -90,7 +83,7 @@ <dictionary> <item> <key> <string>field_id</string> </key> - <value> <string>my_list_field</string> </value> + <value> <string>my_view_mode_category</string> </value> </item> <item> <key> <string>form_id</string> </key> @@ -126,20 +119,4 @@ </dictionary> </pickle> </record> - <record id="3" aka="AAAAAAAAAAM="> - <pickle> - <tuple> - <global name="TALESMethod" module="Products.Formulator.TALESField"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_text</string> </key> - <value> <string>python: getattr(here.portal_categories[field.getId().replace(\'my_\', \'\', 1)], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value> - </item> - </dictionary> - </pickle> - </record> </ZopeData> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_payment_mode.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_payment_mode.xml index b0bdbbbff0..b6762d5996 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_payment_mode.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_payment_mode.xml @@ -14,8 +14,8 @@ <value> <list> <string>description</string> - <string>title</string> <string>items</string> + <string>title</string> </list> </value> </item> @@ -57,6 +57,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> @@ -75,6 +79,10 @@ <key> <string>target</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> </dictionary> </value> </item> @@ -88,12 +96,18 @@ </item> <item> <key> <string>field_id</string> </key> - <value> <string>my_list_field</string> </value> + <value> <string>my_view_mode_category</string> </value> </item> <item> <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_trade/bt/revision b/bt5/erp5_trade/bt/revision index e517ae7abf..7e752471bf 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -917 \ No newline at end of file +918 \ No newline at end of file -- 2.30.9