diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_getDuplicateSelectionNameDict.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_getDuplicateSelectionNameDict.xml index de33b615fa1857185a6ff7c1b05ecff5bc1e83d2..f27af37e6ede876460a26fcbaf1ae3714de7ec47 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_getDuplicateSelectionNameDict.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_getDuplicateSelectionNameDict.xml @@ -81,7 +81,8 @@ for field_path, field in skins_tool.ZopeFind(\n if field.get_tales(\'selection_name\')!=\'\':\n continue\n selection_name = field.get_orig_value(\'selection_name\')\n -\n + if selection_name == \'\':\n + continue\n selection_name_dict.setdefault(\n selection_name, []).append(field_path)\n \n diff --git a/bt5/erp5_forge/bt/change_log b/bt5/erp5_forge/bt/change_log index 21c7d1343c6ff8148d373f11c8717c28a496be61..5fc514b1685995826b19a5e101e727ba62358327 100644 --- a/bt5/erp5_forge/bt/change_log +++ b/bt5/erp5_forge/bt/change_log @@ -1,5 +1,5 @@ 2010-10-19 Kazuhiko -* When checking duplicated selection names, we should use get_recursive_orig_value('selection_name') instead of getRecursiveTemplateField().get_value('selection_name'), because delegation for selection_name can end at any intermediate proxy field. +* When checking duplicated selection names, we should use get_recursive_orig_value('selection_name') instead of getRecursiveTemplateField().get_value('selection_name'), because delegation for selection_name can end at any intermediate proxy field. And skip an empty selection name that is now valid for a listbox where we don't want to store a selection. 2010-10-19 yo * When checking duplicated selection names, skip field libraries, as they don't matter. diff --git a/bt5/erp5_forge/bt/revision b/bt5/erp5_forge/bt/revision index 823aeb4b44b7f09e1692e625ff87d75f224be3b5..e0c903f4749bf954930025608ba618b5c9e24ab1 100644 --- a/bt5/erp5_forge/bt/revision +++ b/bt5/erp5_forge/bt/revision @@ -1 +1 @@ -624 \ No newline at end of file +625 \ No newline at end of file