this change is also required for r29828:

combine 'Columns' items and 'More Columns' items in ListBox configure dialog. now we don't need to include duplicate items in 'More Columns' that already exist in 'Columns'.
FYI, ListBoxRenderer.getAllColumnList() is already implemented like the above.

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

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_configureUI.xml

@@ -113,7 +113,10 @@ try:\n
   groups = form.get_groups()\n
   columns_dict = {}\n
 \n
-  for (k, v) in [(\'None\',\'None\')] + form.get_fields_in_group(groups[0])[0].get_value(\'all_columns\'):\n
+  field = form.get_fields_in_group(groups[0])[0]\n
+  columns = field.get_value(\'columns\')\n
+  all_columns = columns + [x for x in field.get_value(\'all_columns\') if x not in columns]\n
+  for (k, v) in [(\'None\',\'None\')] + all_columns:\n
     if k in field_columns and k != \'None\':\n
       columns_dict[k] = v\n
   columns = []\n
@@ -190,9 +193,13 @@ request[ \'RESPONSE\' ].redirect( redirect_url )\n
                             <string>form</string>
                             <string>groups</string>
                             <string>columns_dict</string>
+                            <string>field</string>
+                            <string>columns</string>
+                            <string>append</string>
+                            <string>$append0</string>
+                            <string>all_columns</string>
                             <string>k</string>
                             <string>v</string>
-                            <string>columns</string>
                             <string>_inplacevar_</string>
                             <string>validation_errors</string>
                             <string>field_errors</string>

product/ERP5/bootstrap/erp5_core/bt/revision

-1340
+1341
\ No newline at end of file