[Erp5-report] r25516 - /erp5/trunk/products/ERP5Type/patches/WorkflowTool.py

[nobody at svn.erp5.org]

Author: romain
Date: Tue Feb 10 18:04:40 2009
New Revision: 25516

URL: http://svn.erp5.org?rev=25516&view=rev
Log:
Unhardcode viewable_owner, owner columns and use catalog parameters instead.

Modified:
    erp5/trunk/products/ERP5Type/patches/WorkflowTool.py

Modified: erp5/trunk/products/ERP5Type/patches/WorkflowTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/patches/WorkflowTool.py?rev=25516&r1=25515&r2=25516&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/patches/WorkflowTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/patches/WorkflowTool.py [utf8] Tue Feb 10 18:04:40 2009
@@ -605,12 +605,15 @@
           self.Base_zCreateWorklistTable()
       portal_catalog = getToolByName(self, 'portal_catalog')
       search_result = portal_catalog.unrestrictedSearchResults
-      acceptable_key_dict = portal_catalog.getSQLCatalog().getColumnMap()
+      sql_catalog = portal_catalog.getSQLCatalog()
+      acceptable_key_dict = sql_catalog.getColumnMap()
       # XXX: those hardcoded lists should be grabbed from the table dynamicaly
       # (and cached).
       table_column_id_set = ImmutableSet(
           [COUNT_COLUMN_TITLE] + self.Base_getWorklistTableColumnIDList())
-      security_column_id_list = ['security_uid', 'viewable_owner', 'owner']
+      security_column_id_list = ['security_uid'] + \
+        [x[1] for x in sql_catalog.getSQLCatalogRoleKeysList()] + \
+        [x[1] for x in sql_catalog.getSQLCatalogLocalRoleKeysList()]
       (worklist_list_grouped_by_condition, worklist_metadata) = \
         groupWorklistListByCondition(
           worklist_dict=worklist_dict,