From 94f699a13d107df476fe9362341ae1cd1fa9cbc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Mon, 21 Jul 2008 15:39:04 +0000
Subject: [PATCH] Base_getCategoriesSpreadSheetMapping returns utf8 encoded
strings, not unicode
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@22601 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../erp5_core/Base_getCategoriesSpreadSheetMapping.xml | 3 +++
product/ERP5/bootstrap/erp5_core/bt/revision | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getCategoriesSpreadSheetMapping.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getCategoriesSpreadSheetMapping.xml
index f1008ab7dc..077849bdf4 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getCategoriesSpreadSheetMapping.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getCategoriesSpreadSheetMapping.xml
@@ -228,6 +228,8 @@ for table_name in spreadsheets.keys():\n
if cell_id not in (\'\', None):\n
# Handle normal properties\n
if not property_id.startswith(\'path_\'):\n
+ if same_type(cell_data, u\'\'):\n
+ cell_data = cell_data.encode(\'utf8\')\n
category_properties[property_id] = cell_data\n
# Handle \'path\' property\n
else:\n
@@ -358,6 +360,7 @@ return categories_spreadsheet_mapping\n
<string>cell_data</string>
<string>cell_id</string>
<string>alt_id_source</string>
+ <string>same_type</string>
<string>path_element_id</string>
<string>absolut_path_element_list</string>
<string>int</string>
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index 03204565ba..da77ca67a5 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-911
\ No newline at end of file
+912
\ No newline at end of file
--
2.30.9