From 10a00f914d8a61088dbbb406e010e9fab1279eec Mon Sep 17 00:00:00 2001 From: Romain Courteaud <romain@nexedi.com> Date: Mon, 23 Aug 2010 14:42:50 +0000 Subject: [PATCH] erp5_commerce's proxy fields should not link to erp5_trade_proxy_field_legacy. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@37958 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../SaleOrder_viewAsWeb/my_comment.xml | 215 +++++++++++++--- .../SaleOrder_viewConfirmAsWeb/my_comment.xml | 229 ++++++++++++++---- bt5/erp5_commerce/bt/revision | 2 +- 3 files changed, 367 insertions(+), 79 deletions(-) diff --git a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/my_comment.xml b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/my_comment.xml index da006f66e6..f8eb666db2 100644 --- a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/my_comment.xml +++ b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/my_comment.xml @@ -2,26 +2,10 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <tuple> - <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> - <tuple/> - </tuple> + <global name="TextAreaField" module="Products.Formulator.StandardFields"/> </pickle> <pickle> <dictionary> - <item> - <key> <string>delegated_list</string> </key> - <value> - <list> - <string>css_class</string> - <string>default</string> - <string>description</string> - <string>enabled</string> - <string>hidden</string> - <string>title</string> - </list> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>my_comment</string> </value> @@ -34,6 +18,22 @@ <key> <string>external_validator_failed</string> </key> <value> <string>The input failed the external validator.</string> </value> </item> + <item> + <key> <string>line_too_long</string> </key> + <value> <string>A line was too long.</string> </value> + </item> + <item> + <key> <string>required_not_found</string> </key> + <value> <string>Input is required but no input given.</string> </value> + </item> + <item> + <key> <string>too_long</string> </key> + <value> <string>You entered too many characters.</string> </value> + </item> + <item> + <key> <string>too_many_lines</string> </key> + <value> <string>You entered too many lines.</string> </value> + </item> </dictionary> </value> </item> @@ -42,15 +42,75 @@ <value> <dictionary> <item> - <key> <string>field_id</string> </key> + <key> <string>alternate_name</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>form_id</string> </key> + <key> <string>css_class</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>target</string> </key> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>height</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_length</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_linelength</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_lines</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>unicode</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>width</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -60,6 +120,10 @@ <key> <string>tales</string> </key> <value> <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>css_class</string> </key> <value> <string></string> </value> @@ -74,6 +138,10 @@ <key> <string>description</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>enabled</string> </key> <value> @@ -81,25 +149,55 @@ </value> </item> <item> - <key> <string>field_id</string> </key> + <key> <string>external_validator</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>form_id</string> </key> + <key> <string>extra</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>height</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> + </item> <item> <key> <string>hidden</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>target</string> </key> + <key> <string>max_length</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_linelength</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_lines</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> <value> <string></string> </value> </item> <item> <key> <string>title</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>unicode</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>width</string> </key> + <value> <string></string> </value> + </item> </dictionary> </value> </item> @@ -107,6 +205,10 @@ <key> <string>values</string> </key> <value> <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>css_class</string> </key> <value> <string></string> </value> @@ -119,30 +221,62 @@ <key> <string>description</string> </key> <value> <string>The customer must be able to add a comment during the checkout procedure.</string> </value> </item> + <item> + <key> <string>editable</string> </key> + <value> <int>1</int> </value> + </item> <item> <key> <string>enabled</string> </key> <value> <int>1</int> </value> </item> <item> - <key> <string>field_id</string> </key> - <value> <string>my_comment</string> </value> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> </item> <item> - <key> <string>form_id</string> </key> - <value> <string>SaleOrder_viewFieldLibrary</string> </value> + <key> <string>height</string> </key> + <value> <int>5</int> </value> </item> <item> <key> <string>hidden</string> </key> <value> <int>0</int> </value> </item> <item> - <key> <string>target</string> </key> - <value> <string>Click to edit the target</string> </value> + <key> <string>max_length</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_linelength</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_lines</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <int>0</int> </value> </item> <item> <key> <string>title</string> </key> <value> <string>Comment</string> </value> </item> + <item> + <key> <string>unicode</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>width</string> </key> + <value> <int>40</int> </value> + </item> </dictionary> </value> </item> @@ -151,10 +285,7 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <global name="TALESMethod" module="Products.Formulator.TALESField"/> - <tuple/> - </tuple> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> </pickle> <pickle> <dictionary> @@ -167,10 +298,7 @@ </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <global name="TALESMethod" module="Products.Formulator.TALESField"/> - <tuple/> - </tuple> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> </pickle> <pickle> <dictionary> @@ -181,4 +309,17 @@ </dictionary> </pickle> </record> + <record id="4" aka="AAAAAAAAAAQ="> + <pickle> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python: preferences.getPreference(\'preferred_textarea_height\', 5)</string> </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewConfirmAsWeb/my_comment.xml b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewConfirmAsWeb/my_comment.xml index e6a4897dc1..57afa0b69f 100644 --- a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewConfirmAsWeb/my_comment.xml +++ b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewConfirmAsWeb/my_comment.xml @@ -2,25 +2,10 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <tuple> - <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> - <tuple/> - </tuple> + <global name="TextAreaField" module="Products.Formulator.StandardFields"/> </pickle> <pickle> <dictionary> - <item> - <key> <string>delegated_list</string> </key> - <value> - <list> - <string>css_class</string> - <string>default</string> - <string>description</string> - <string>hidden</string> - <string>title</string> - </list> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>my_comment</string> </value> @@ -33,6 +18,22 @@ <key> <string>external_validator_failed</string> </key> <value> <string>The input failed the external validator.</string> </value> </item> + <item> + <key> <string>line_too_long</string> </key> + <value> <string>A line was too long.</string> </value> + </item> + <item> + <key> <string>required_not_found</string> </key> + <value> <string>Input is required but no input given.</string> </value> + </item> + <item> + <key> <string>too_long</string> </key> + <value> <string>You entered too many characters.</string> </value> + </item> + <item> + <key> <string>too_many_lines</string> </key> + <value> <string>You entered too many lines.</string> </value> + </item> </dictionary> </value> </item> @@ -41,15 +42,75 @@ <value> <dictionary> <item> - <key> <string>field_id</string> </key> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>form_id</string> </key> + <key> <string>description</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>target</string> </key> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>height</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_length</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_linelength</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_lines</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>unicode</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>width</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -59,6 +120,10 @@ <key> <string>tales</string> </key> <value> <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>css_class</string> </key> <value> @@ -76,27 +141,65 @@ <value> <string></string> </value> </item> <item> - <key> <string>field_id</string> </key> + <key> <string>editable</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>form_id</string> </key> + <key> <string>enabled</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>hidden</string> </key> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>height</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> </value> </item> <item> - <key> <string>target</string> </key> + <key> <string>hidden</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent> + </value> + </item> + <item> + <key> <string>max_length</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_linelength</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_lines</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> <value> <string></string> </value> </item> <item> <key> <string>title</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>unicode</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>width</string> </key> + <value> <string></string> </value> + </item> </dictionary> </value> </item> @@ -104,6 +207,10 @@ <key> <string>values</string> </key> <value> <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>css_class</string> </key> <value> <string></string> </value> @@ -117,25 +224,61 @@ <value> <string>The customer must be able to add a comment during the checkout procedure.</string> </value> </item> <item> - <key> <string>field_id</string> </key> - <value> <string>my_comment</string> </value> + <key> <string>editable</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <int>1</int> </value> </item> <item> - <key> <string>form_id</string> </key> - <value> <string>SaleOrder_viewFieldLibrary</string> </value> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>height</string> </key> + <value> <int>5</int> </value> </item> <item> <key> <string>hidden</string> </key> <value> <int>0</int> </value> </item> <item> - <key> <string>target</string> </key> - <value> <string>Click to edit the target</string> </value> + <key> <string>max_length</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_linelength</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_lines</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <int>0</int> </value> </item> <item> <key> <string>title</string> </key> <value> <string>Comment</string> </value> </item> + <item> + <key> <string>unicode</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>width</string> </key> + <value> <int>40</int> </value> + </item> </dictionary> </value> </item> @@ -144,10 +287,7 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <global name="TALESMethod" module="Products.Formulator.TALESField"/> - <tuple/> - </tuple> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> </pickle> <pickle> <dictionary> @@ -160,10 +300,7 @@ </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <global name="TALESMethod" module="Products.Formulator.TALESField"/> - <tuple/> - </tuple> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> </pickle> <pickle> <dictionary> @@ -176,10 +313,20 @@ </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <tuple> - <global name="TALESMethod" module="Products.Formulator.TALESField"/> - <tuple/> - </tuple> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python: preferences.getPreference(\'preferred_textarea_height\', 5)</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="5" aka="AAAAAAAAAAU="> + <pickle> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> </pickle> <pickle> <dictionary> diff --git a/bt5/erp5_commerce/bt/revision b/bt5/erp5_commerce/bt/revision index a9d8b73e69..ce83bd94b3 100644 --- a/bt5/erp5_commerce/bt/revision +++ b/bt5/erp5_commerce/bt/revision @@ -1 +1 @@ -257 \ No newline at end of file +258 \ No newline at end of file -- 2.30.9