Commit 448e0028 authored by Julien Muchembled's avatar Julien Muchembled

Fix assertion and use 'catalog' by default.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@24763 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 8013a2e0
...@@ -493,8 +493,12 @@ def WorkflowTool_listActions(self, info=None, object=None, src__=False): ...@@ -493,8 +493,12 @@ def WorkflowTool_listActions(self, info=None, object=None, src__=False):
for i, table_id in enumerate(mapped_key[0].split(','))) for i, table_id in enumerate(mapped_key[0].split(',')))
table_id, column_id = table_alias_list[-1][1], mapped_key[1] table_id, column_id = table_alias_list[-1][1], mapped_key[1]
else: # normal column else: # normal column
assert len(mapped_key) == 1 if len(mapped_key) == 1:
table_id, column_id = mapped_key[0], criterion_id 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' select_expression.append('%s.%s as %s'
% (table_id, column_id, criterion_id)) % (table_id, column_id, criterion_id))
query.getRelatedTableMapDict = lambda: related_table_map_dict query.getRelatedTableMapDict = lambda: related_table_map_dict
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment