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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Oct 20 10:23:20 2009
New Revision: 29829

URL: http://svn.erp5.org?rev=29829&view=rev
Log:
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.

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

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_configureUI.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_configureUI.xml?rev=29829&r1=29828&r2=29829&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_configureUI.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_configureUI.xml [utf8] Tue Oct 20 10:23:20 2009
@@ -113,7 +113,10 @@
   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 @@
                             <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>

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=29829&r1=29828&r2=29829&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Tue Oct 20 10:23:20 2009
@@ -1,1 +1,1 @@
-1340
+1341