[Erp5-report] r42716 nicolas - /erp5/trunk/products/ERP5Form/ListBox.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Thu Jan 27 18:06:03 2011
New Revision: 42716

URL: http://svn.erp5.org?rev=42716&view=rev
Log:
* Do not return all supported column of current catalog, keep only the one used in listbox.
* Detect searchable column from dynamic related key feature of catalog.

Modified:
    erp5/trunk/products/ERP5Form/ListBox.py

Modified: erp5/trunk/products/ERP5Form/ListBox.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/ListBox.py?rev=42716&r1=42715&r2=42716&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/ListBox.py [utf8] (original)
+++ erp5/trunk/products/ERP5Form/ListBox.py [utf8] Thu Jan 27 18:06:03 2011
@@ -1006,7 +1006,11 @@ class ListBoxRenderer:
     if search_columns:
       search_column_id_list = [c[0] for c in search_columns]
     else:
-      search_column_id_list = self.getCatalogTool().schema()
+      search_column_id_list = []
+      isValidColumn = self.getCatalogTool().getSQLCatalog().isValidColumn
+      for column_id, column_title in self.getAllColumnList():
+        if isValidColumn(column_id):
+          search_column_id_list.append(column_id)
     return set(search_column_id_list)
 
   getSearchColumnIdSet = lazyMethod(getSearchColumnIdSet)