[Erp5-report] r18478 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...

[nobody at svn.erp5.org]

Author: yusei
Date: Fri Dec 21 18:32:58 2007
New Revision: 18478

URL: http://svn.erp5.org?rev=18478&view=rev
Log:
Call convertToBaseFormat explicitly.(By recent dms refactoring, conversion to base format is not done implicitly.)

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFile.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFile.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFile.xml?rev=18478&r1=18477&r2=18478&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFile.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFile.xml Fri Dec 21 18:32:58 2007
@@ -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 @@
   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 @@
                             <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>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=18478&r1=18477&r2=18478&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Fri Dec 21 18:32:58 2007
@@ -1,1 +1,1 @@
-657
+658