Commit ca2fea70 authored by Vincent Pelletier's avatar Vincent Pelletier

Revert commit 15547, it was not ready yet to be integrated.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@15548 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 32092571
......@@ -2071,7 +2071,7 @@ class Catalog( Folder,
new_key = '%s.%s' % (query_table, key)
elif key == 'uid':
# uid is always ambiguous so we can only change it here
new_key = '%s.uid' % (query_table, )
new_key = 'catalog.uid'
else:
new_key = key
if new_key is not None:
......@@ -2087,7 +2087,7 @@ class Catalog( Folder,
select_expression = ''
group_by_expression = ''
from_table_dict = {}
from_table_dict = {'catalog' : 'catalog'} # Always include catalog table
if len(kw):
if kw.has_key('select_expression'):
select_expression_list.append(kw['select_expression'])
......
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