From 35df00a3fbe557f0f2188d7b2880f79a8f381e13 Mon Sep 17 00:00:00 2001
From: Ivan Tyagov <ivan@nexedi.com>
Date: Wed, 7 Apr 2010 06:48:01 +0000
Subject: [PATCH] Proxify ERP5 form.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@34310 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
...le_viewCreateNewDiscussionThreadDialog.xml | 2 +-
.../your_captcha.xml | 121 +++---------------
...read_viewCreateNewDiscussionPostDialog.xml | 5 +-
.../your_captcha.xml | 121 +++---------------
bt5/erp5_discussion/bt/revision | 2 +-
5 files changed, 36 insertions(+), 215 deletions(-)
diff --git a/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThreadModule_viewCreateNewDiscussionThreadDialog.xml b/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThreadModule_viewCreateNewDiscussionThreadDialog.xml
index 8c490abfa6..ca93a45ca5 100644
--- a/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThreadModule_viewCreateNewDiscussionThreadDialog.xml
+++ b/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThreadModule_viewCreateNewDiscussionThreadDialog.xml
@@ -79,6 +79,7 @@
<value>
<list>
<string>your_text_content</string>
+ <string>your_captcha</string>
</list>
</value>
</item>
@@ -86,7 +87,6 @@
<key> <string>center</string> </key>
<value>
<list>
- <string>your_captcha</string>
<string>my_description</string>
</list>
</value>
diff --git a/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThreadModule_viewCreateNewDiscussionThreadDialog/your_captcha.xml b/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThreadModule_viewCreateNewDiscussionThreadDialog/your_captcha.xml
index 8d830ffdb1..f81c82b5f4 100644
--- a/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThreadModule_viewCreateNewDiscussionThreadDialog/your_captcha.xml
+++ b/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThreadModule_viewCreateNewDiscussionThreadDialog/your_captcha.xml
@@ -3,18 +3,17 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="CaptchaField" module="Products.ERP5Form.CaptchaField"/>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
- <key> <string>_CaptchaField__extraPropertyList</string> </key>
+ <key> <string>delegated_list</string> </key>
<value>
<list>
- <string>captcha_dot_net_client</string>
- <string>captcha_dot_net_secret</string>
+ <string>enabled</string>
</list>
</value>
</item>
@@ -30,10 +29,6 @@
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
- <item>
- <key> <string>wrong_captcha</string> </key>
- <value> <string>You did not enter the right answer.</string> </value>
- </item>
</dictionary>
</value>
</item>
@@ -42,43 +37,15 @@
<value>
<dictionary>
<item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>captcha_type</string> </key>
+ <key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>css_class</string> </key>
+ <key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <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>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
+ <key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -88,30 +55,6 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>captcha_type</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>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>
@@ -119,15 +62,15 @@
</value>
</item>
<item>
- <key> <string>external_validator</string> </key>
+ <key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>hidden</string> </key>
+ <key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>title</string> </key>
+ <key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -137,53 +80,21 @@
<key> <string>values</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>captcha_dot_net_client</string> </key>
- <value> <string>demo</string> </value>
- </item>
- <item>
- <key> <string>captcha_dot_net_secret</string> </key>
- <value> <string>secret</string> </value>
- </item>
- <item>
- <key> <string>captcha_type</string> </key>
- <value> <string>text</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>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <int>1</int> </value>
- </item>
<item>
<key> <string>enabled</string> </key>
- <value> <int>0</int> </value>
+ <value> <int>1</int> </value>
</item>
<item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
+ <key> <string>field_id</string> </key>
+ <value> <string>your_captcha</string> </value>
</item>
<item>
- <key> <string>hidden</string> </key>
- <value> <int>0</int> </value>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
- <key> <string>title</string> </key>
- <value> <string>Captcha</string> </value>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
diff --git a/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewCreateNewDiscussionPostDialog.xml b/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewCreateNewDiscussionPostDialog.xml
index 500b0043b6..f3b21036c7 100644
--- a/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewCreateNewDiscussionPostDialog.xml
+++ b/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewCreateNewDiscussionPostDialog.xml
@@ -79,15 +79,14 @@
<value>
<list>
<string>your_text_content</string>
+ <string>your_captcha</string>
</list>
</value>
</item>
<item>
<key> <string>center</string> </key>
<value>
- <list>
- <string>your_captcha</string>
- </list>
+ <list/>
</value>
</item>
<item>
diff --git a/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewCreateNewDiscussionPostDialog/your_captcha.xml b/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewCreateNewDiscussionPostDialog/your_captcha.xml
index 8d830ffdb1..f81c82b5f4 100644
--- a/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewCreateNewDiscussionPostDialog/your_captcha.xml
+++ b/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewCreateNewDiscussionPostDialog/your_captcha.xml
@@ -3,18 +3,17 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="CaptchaField" module="Products.ERP5Form.CaptchaField"/>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
- <key> <string>_CaptchaField__extraPropertyList</string> </key>
+ <key> <string>delegated_list</string> </key>
<value>
<list>
- <string>captcha_dot_net_client</string>
- <string>captcha_dot_net_secret</string>
+ <string>enabled</string>
</list>
</value>
</item>
@@ -30,10 +29,6 @@
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
- <item>
- <key> <string>wrong_captcha</string> </key>
- <value> <string>You did not enter the right answer.</string> </value>
- </item>
</dictionary>
</value>
</item>
@@ -42,43 +37,15 @@
<value>
<dictionary>
<item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>captcha_type</string> </key>
+ <key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>css_class</string> </key>
+ <key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <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>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
+ <key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -88,30 +55,6 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>captcha_type</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>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>
@@ -119,15 +62,15 @@
</value>
</item>
<item>
- <key> <string>external_validator</string> </key>
+ <key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>hidden</string> </key>
+ <key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>title</string> </key>
+ <key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -137,53 +80,21 @@
<key> <string>values</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>captcha_dot_net_client</string> </key>
- <value> <string>demo</string> </value>
- </item>
- <item>
- <key> <string>captcha_dot_net_secret</string> </key>
- <value> <string>secret</string> </value>
- </item>
- <item>
- <key> <string>captcha_type</string> </key>
- <value> <string>text</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>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <int>1</int> </value>
- </item>
<item>
<key> <string>enabled</string> </key>
- <value> <int>0</int> </value>
+ <value> <int>1</int> </value>
</item>
<item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
+ <key> <string>field_id</string> </key>
+ <value> <string>your_captcha</string> </value>
</item>
<item>
- <key> <string>hidden</string> </key>
- <value> <int>0</int> </value>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
- <key> <string>title</string> </key>
- <value> <string>Captcha</string> </value>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
diff --git a/bt5/erp5_discussion/bt/revision b/bt5/erp5_discussion/bt/revision
index aaa6442fe9..f70d7bba4a 100644
--- a/bt5/erp5_discussion/bt/revision
+++ b/bt5/erp5_discussion/bt/revision
@@ -1 +1 @@
-41
\ No newline at end of file
+42
\ No newline at end of file
--
2.30.9