[Erp5-report] r26018 - in /erp5/trunk/bt5/erp5_base: SkinTemplateItem/portal_skins/erp5_bas...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Mar 13 12:45:28 2009
New Revision: 26018

URL: http://svn.erp5.org?rev=26018&view=rev
Log:
* fix UnboundLocalError that happens if no property is selected.

Modified:
    erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOo.xml
    erp5/trunk/bt5/erp5_base/bt/revision

Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOo.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOo.xml?rev=26018&r1=26017&r2=26018&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOo.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOo.xml [utf8] Fri Mar 13 12:45:28 2009
@@ -144,7 +144,7 @@
 \n
     # Build a data structure to associate column index with object property and portal type\n
     column_mapping = {}\n
-    for (column_name, property_dict) in mapping[spreadsheet_name].items():\n
+    for (column_name, property_dict) in mapping.get(sheet_name, {}).items():\n
       for (column_id, column_title) in column_index.items():\n
         if column_name == column_title:\n
           column_mapping[column_id] = property_dict\n

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=26018&r1=26017&r2=26018&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Fri Mar 13 12:45:28 2009
@@ -1,1 +1,1 @@
-547
+550