From 5a82f318b83bc5e6676bdc3e19d538e0ead6578b Mon Sep 17 00:00:00 2001
From: Nicolas Delaby <nicolas@nexedi.com>
Date: Wed, 9 Feb 2011 16:54:01 +0000
Subject: [PATCH] * Create ExternalValidator able to check TALES Expression
Syntax * Extend Field Library with my_tales_expression (StringField with
custom Validator) * Proxify fields which are defining Tales expression as
input against this template field
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@43242 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../my_acquisition_portal_type.xml | 12 +-
.../my_acquisition_portal_type_list.xml | 4 +-
...validateStringFieldWithTALESExpression.xml | 73 +++++++++++
.../erp5_core/Base_viewFieldLibrary.xml | 1 +
.../my_tales_expression.xml | 121 ++++++++++++++++++
.../my_property_default.xml | 4 +-
product/ERP5/bootstrap/erp5_core/bt/revision | 2 +-
7 files changed, 201 insertions(+), 16 deletions(-)
create mode 100644 product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_validateStringFieldWithTALESExpression.xml
create mode 100644 product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewFieldLibrary/my_tales_expression.xml
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/AcquiredProperty_view/my_acquisition_portal_type.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/AcquiredProperty_view/my_acquisition_portal_type.xml
index b161361670..32d688a29a 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/AcquiredProperty_view/my_acquisition_portal_type.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/AcquiredProperty_view/my_acquisition_portal_type.xml
@@ -10,8 +10,6 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>description</string>
- <string>display_width</string>
<string>title</string>
</list>
</value>
@@ -73,17 +71,9 @@
<key> <string>values</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>description</string> </key>
- <value> <string>The portal types to browse</string> </value>
- </item>
- <item>
- <key> <string>display_width</string> </key>
- <value> <int>20</int> </value>
- </item>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_string_field</string> </value>
+ <value> <string>my_tales_expression</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseCategory_view/my_acquisition_portal_type_list.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseCategory_view/my_acquisition_portal_type_list.xml
index ba6cc768c1..996f1f51c4 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseCategory_view/my_acquisition_portal_type_list.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseCategory_view/my_acquisition_portal_type_list.xml
@@ -10,8 +10,8 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>title</string>
<string>default</string>
+ <string>title</string>
</list>
</value>
</item>
@@ -84,7 +84,7 @@
</item>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_string_field</string> </value>
+ <value> <string>my_tales_expression</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_validateStringFieldWithTALESExpression.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_validateStringFieldWithTALESExpression.xml
new file mode 100644
index 0000000000..941691a83f
--- /dev/null
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_validateStringFieldWithTALESExpression.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string>from Products.ERP5Type.Utils import isValidTALESExpression\n
+from Products.Formulator.Errors import ValidationError\n
+\n
+valid, message = isValidTALESExpression(value)\n
+if valid:\n
+ return True\n
+raise ValidationError(\'external_validator_failed\', context, error_text=message)\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>value, REQUEST</string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>Base_validateStringFieldWithTALESExpression</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewFieldLibrary.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewFieldLibrary.xml
index 3b8f25fc98..51e920a031 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewFieldLibrary.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewFieldLibrary.xml
@@ -186,6 +186,7 @@
<string>my_dialog_mode_reference</string>
<string>my_amount_generator_quantity</string>
<string>my_dialog_mode_category</string>
+ <string>my_tales_expression</string>
</list>
</value>
</item>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewFieldLibrary/my_tales_expression.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewFieldLibrary/my_tales_expression.xml
new file mode 100644
index 0000000000..a0c294de38
--- /dev/null
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewFieldLibrary/my_tales_expression.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>description</string>
+ <string>external_validator</string>
+ <string>title</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>my_tales_expression</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string>StringField with custom ExternalValidator which is able to tell if user input is valid against TALES Compiler.</string> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_string_field</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>String Tales Expression</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <global name="Method" module="Products.Formulator.MethodField"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>method_name</string> </key>
+ <value> <string>Base_validateStringFieldWithTALESExpression</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/StandardProperty_view/my_property_default.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/StandardProperty_view/my_property_default.xml
index ab765a745d..6f51fcb035 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/StandardProperty_view/my_property_default.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/StandardProperty_view/my_property_default.xml
@@ -10,8 +10,8 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>description</string>
<string>display_width</string>
+ <string>description</string>
<string>title</string>
</list>
</value>
@@ -83,7 +83,7 @@
</item>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_string_field</string> </value>
+ <value> <string>my_tales_expression</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index c35d7f3745..68ddf4b8b2 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-40875
\ No newline at end of file
+40877
\ No newline at end of file
--
2.30.9