From 271fc63271d713dc85a6848725cda206a2043a17 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Fri, 13 Mar 2009 11:45:28 +0000 Subject: [PATCH] * fix UnboundLocalError that happens if no property is selected. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26018 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_base/ERP5Site_importObjectFromOOo.xml | 2 +- bt5/erp5_base/bt/revision | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOo.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOo.xml index f534d21166..f99b81160c 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOo.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOo.xml @@ -144,7 +144,7 @@ else:\n \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 diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision index ea5ca3642f..b1ce634589 100644 --- a/bt5/erp5_base/bt/revision +++ b/bt5/erp5_base/bt/revision @@ -1 +1 @@ -547 \ No newline at end of file +550 \ No newline at end of file -- 2.30.9