[Erp5-report] r28574 - in /erp5/trunk/bt5/erp5_ooo_import: SkinTemplateItem/portal_skins/er...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Aug 24 12:28:49 2009
New Revision: 28574

URL: http://svn.erp5.org?rev=28574&view=rev
Log:
use a local property 'spreadsheet_mapping' instead of 'data' property, because 'data' property should be only str or None since r28358.

Added:
    erp5/trunk/bt5/erp5_ooo_import/bt/template_local_role_list
    erp5/trunk/bt5/erp5_ooo_import/bt/template_portal_type_role_list
Modified:
    erp5/trunk/bt5/erp5_ooo_import/SkinTemplateItem/portal_skins/erp5_ooo_import/Base_importFile.xml
    erp5/trunk/bt5/erp5_ooo_import/bt/revision

Modified: erp5/trunk/bt5/erp5_ooo_import/SkinTemplateItem/portal_skins/erp5_ooo_import/Base_importFile.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ooo_import/SkinTemplateItem/portal_skins/erp5_ooo_import/Base_importFile.xml?rev=28574&r1=28573&r2=28574&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ooo_import/SkinTemplateItem/portal_skins/erp5_ooo_import/Base_importFile.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ooo_import/SkinTemplateItem/portal_skins/erp5_ooo_import/Base_importFile.xml [utf8] Mon Aug 24 12:28:49 2009
@@ -115,7 +115,7 @@
   session_id = context.browser_id_manager.getBrowserId(create=1)\n
   session = context.portal_sessions[session_id]\n
   temp_file = newTempFile(context, session_id)\n
-  temp_file.edit(data=spreadsheets)\n
+  temp_file.edit(spreadsheet_mapping=spreadsheets)\n
 \n
   #create a temporary file_name\n
   timestamp = "%s" % DateTime.timeTime(DateTime())\n
@@ -143,7 +143,7 @@
     temp_file = session[temp_file_name]\n
     # Clear this session after import is done\n
     session[temp_file_name] = None\n
-    spreadsheets = temp_file.getData()\n
+    spreadsheets = temp_file.getProperty(\'spreadsheet_mapping\')\n
 \n
   # Build the data mapping\n
   mapping = {}\n

Modified: erp5/trunk/bt5/erp5_ooo_import/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ooo_import/bt/revision?rev=28574&r1=28573&r2=28574&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ooo_import/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_ooo_import/bt/revision [utf8] Mon Aug 24 12:28:49 2009
@@ -1,1 +1,1 @@
-393
+394

Added: erp5/trunk/bt5/erp5_ooo_import/bt/template_local_role_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ooo_import/bt/template_local_role_list?rev=28574&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_ooo_import/bt/template_portal_type_role_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ooo_import/bt/template_portal_type_role_list?rev=28574&view=auto
==============================================================================
    (empty)