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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Wed Nov  5 15:28:12 2008
New Revision: 24493

URL: http://svn.erp5.org?rev=24493&view=rev
Log:
For backward compatibility, we should handle the case when item['choice'] is not a list.

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

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_installBusinessTemplateListAction.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_installBusinessTemplateListAction.xml?rev=24493&r1=24492&r2=24493&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_installBusinessTemplateListAction.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_installBusinessTemplateListAction.xml [utf8] Wed Nov  5 15:28:12 2008
@@ -62,7 +62,10 @@
 object_to_update = {}\n
 for item in listbox:\n
   bt_id, object_id = item[\'listbox_key\'].split(\'|\')\n
-  bt_dict.setdefault(bt_id, dict())[object_id] = item[\'choice\'][0]\n
+  try:\n
+    bt_dict.setdefault(bt_id, dict())[object_id] = item[\'choice\'][0]\n
+  except IndexError:\n
+    bt_dict.setdefault(bt_id, dict())[object_id] = item[\'choice\']\n
 \n
 bt_title_list = []\n
 for bt_id in bt_id_list:\n

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=24493&r1=24492&r2=24493&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Wed Nov  5 15:28:12 2008
@@ -1,1 +1,1 @@
-1011
+1012