From 16c8b75ef6dd17ac46677fa73ba062a4a9cf5ab8 Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Fri, 3 Jul 2009 04:51:01 +0000
Subject: [PATCH] use StringField instead of TextAreaField for
BusinessTemplate_viewObjectsDiff/diffview, otherwise the value is not
escaped.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27884 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../diffview.xml | 101 +++++++-----------
product/ERP5/bootstrap/erp5_core/bt/revision | 2 +-
2 files changed, 40 insertions(+), 63 deletions(-)
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewObjectsDiff/diffview.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewObjectsDiff/diffview.xml
index 1b34bda015..506e03aede 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewObjectsDiff/diffview.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewObjectsDiff/diffview.xml
@@ -3,7 +3,7 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
+ <global name="StringField" module="Products.Formulator.StandardFields"/>
<tuple/>
</tuple>
</pickle>
@@ -21,21 +21,13 @@
<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>
+ <value> <string>Too much input was given.</string> </value>
</item>
</dictionary>
</value>
@@ -61,39 +53,35 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>editable</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
+ <key> <string>display_maxwidth</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>external_validator</string> </key>
+ <key> <string>display_width</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>extra</string> </key>
+ <key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>height</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>max_length</string> </key>
+ <key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>max_linelength</string> </key>
+ <key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>max_lines</string> </key>
+ <key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -105,15 +93,15 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>unicode</string> </key>
+ <key> <string>truncate</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>whitespace_preserve</string> </key>
+ <key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>width</string> </key>
+ <key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -142,39 +130,35 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>editable</string> </key>
+ <key> <string>display_maxwidth</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>enabled</string> </key>
+ <key> <string>display_width</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>
+ <key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>height</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>max_length</string> </key>
+ <key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>max_linelength</string> </key>
+ <key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>max_lines</string> </key>
+ <key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -186,15 +170,15 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>unicode</string> </key>
+ <key> <string>truncate</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>whitespace_preserve</string> </key>
+ <key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>width</string> </key>
+ <key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -220,6 +204,14 @@
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>display_maxwidth</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>display_width</string> </key>
+ <value> <int>20</int> </value>
+ </item>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
@@ -236,10 +228,6 @@
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>height</string> </key>
- <value> <int>30</int> </value>
- </item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
@@ -248,14 +236,6 @@
<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>
@@ -265,16 +245,16 @@
<value> <string>Diff</string> </value>
</item>
<item>
- <key> <string>unicode</string> </key>
+ <key> <string>truncate</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>whitespace_preserve</string> </key>
+ <key> <string>unicode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>width</string> </key>
- <value> <int>150</int> </value>
+ <key> <string>whitespace_preserve</string> </key>
+ <value> <int>0</int> </value>
</item>
</dictionary>
</value>
@@ -285,18 +265,15 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: here.diffObject(request)</string> </value>
+ <value> <string>python:here.diffObject(request)</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index 09c2854e84..1280674f38 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-1246
\ No newline at end of file
+1247
\ No newline at end of file
--
2.30.9