Ignore selection duplicates in the same field in different skin folders....

Ignore selection duplicates in the same field in different skin folders. They're likely to be overriding one another, and so the duplication is intentional and/or meaningless.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@42429 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_checkDuplicateSelectionName.xml

@@ -55,8 +55,9 @@
 """\n
 \n
 selection_name_dict = context.SkinsTool_getDuplicateSelectionNameDict()\n
-for selection_name, field_list in selection_name_dict.items():\n
-  print repr(selection_name), \'\\n\\t\', \'\\n\\t\'.join(field_list)\n
+for selection_name, field_map in selection_name_dict.items():\n
+  print repr(selection_name), \'\\n\\t\', \'\\n\\t\'.join(["%r: %s" % (field, skin_list) \n
+                                                   for field, skin_list in field_map.items()])\n
 return printed\n
 </string> </value>
         </item>

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_getDuplicateSelectionNameDict.xml

@@ -60,6 +60,7 @@ skins_tool = context.portal_skins\n
 selection_name_dict = {}\n
 \n
 ok_to_share_selection_form_list = [\'Resource_viewInventory\', \'Resource_viewMovementHistory\']\n
+legacy_skin_folders = [\'erp5_simulation_legacy\']\n
 \n
 for field_path, field in skins_tool.ZopeFind(\n
          skins_tool, obj_metatypes=[\'ProxyField\', \'ListBox\'], search_sub=1):\n
@@ -83,8 +84,12 @@ for field_path, field in skins_tool.ZopeFind(\n
     selection_name = field.get_orig_value(\'selection_name\')\n
   if selection_name == \'\':\n
     continue\n
-  selection_name_dict.setdefault(\n
-         selection_name, []).append(field_path)\n
+  skin_folder, field_path = field_path.split(\'/\', 1)\n
+  if skin_folder in legacy_skin_folders:\n
+    # we don\'t care about selection duplication in legacy fields\n
+    continue\n
+  field_path_map = selection_name_dict.setdefault(selection_name, {})\n
+  field_path_map.setdefault(field_path, []).append(skin_folder)\n
 \n
 # leave only duplicating ones\n
 duplicating_selection_name_dict = {}\n

bt5/erp5_forge/bt/revision

-635
\ No newline at end of file
+638
\ No newline at end of file