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

[nobody at svn.erp5.org]

Author: jm
Date: Tue Dec  2 12:43:24 2008
New Revision: 24763

URL: http://svn.erp5.org?rev=24763&view=rev
Log:
Fix assertion and use 'catalog' by default.

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=24763&r1=24762&r2=24763&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/patches/WorkflowTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/patches/WorkflowTool.py [utf8] Tue Dec  2 12:43:24 2008
@@ -493,8 +493,12 @@
               for i, table_id in enumerate(mapped_key[0].split(',')))
             table_id, column_id = table_alias_list[-1][1], mapped_key[1]
           else: # normal column
-            assert len(mapped_key) == 1
-            table_id, column_id = mapped_key[0], criterion_id
+            if len(mapped_key) == 1:
+              table_id = mapped_key[0]
+            else:
+              table_id = 'catalog'
+              assert table_id in mapped_key
+            column_id = criterion_id
           select_expression.append('%s.%s as %s'
                                    % (table_id, column_id, criterion_id))
         query.getRelatedTableMapDict = lambda: related_table_map_dict