From c252e31c291b7632aa9b29b39d7096e7895d6719 Mon Sep 17 00:00:00 2001
From: Yusei Tahara <yusei@nexedi.com>
Date: Fri, 21 Dec 2007 17:32:58 +0000
Subject: [PATCH] Call convertToBaseFormat explicitly.(By recent dms
 refactoring, conversion to base format is not done implicitly.)

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18478 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../erp5_core/CategoryTool_importCategoryFile.xml        | 9 ++++-----
 product/ERP5/bootstrap/erp5_core/bt/revision             | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFile.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFile.xml
index 944eba5a95..7303d4cf49 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFile.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFile.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -150,6 +147,7 @@ if not (content_type.startswith(\'application/vnd.sun.xml\')\n
   tmp_ooo = newTempOOoDocument(context, "_")\n
   tmp_ooo.edit(data=import_file.read(),\n
                content_type=content_type)\n
+  tmp_ooo.convertToBaseFormat()\n
   ignored, import_file_content = tmp_ooo.convert(\'sxc\')\n
   OOoParser.openFromString(str(import_file_content))\n
 else:\n
@@ -495,6 +493,7 @@ return context.REQUEST.RESPONSE.redirect(\n
                             <string>column_id</string>
                             <string>path_def_started</string>
                             <string>_write_</string>
+                            <string>_inplacevar_</string>
                             <string>categories</string>
                             <string>base_category_name</string>
                             <string>base_category_id</string>
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index 06834d4380..e59f0632ab 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-657
\ No newline at end of file
+658
\ No newline at end of file
-- 
2.30.9