odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] orm.search: properly JOIN parent table when applying inherited ir.rules 

bzr revid: odo@openerp.com-20101005134908-17yblagoww1orrtk
This commit is contained in:
Olivier Dony 2010-10-05 15:49:08 +02:00
parent 0888189083
commit 7f30ad68d5
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bin/osv/orm.py
View File

@ -3927,8 +3927,12 @@ class orm(orm_template):
:param query: the current query object
"""
def apply_rule(added_clause, added_params, added_tables):
def apply_rule(added_clause, added_params, added_tables, parent_model=None, child_object=None):
if added_clause:
if parent_model and child_object:
# as inherited rules are being applied, we need to add the missing JOIN
# to reach the parent table (if it was not JOINed yet in the query)
child_object._inherits_join_add(parent_model, query)
query.where_clause += added_clause
query.where_clause_params += added_params
for table in added_tables:
@ -3941,13 +3945,11 @@ class orm(orm_template):
rule_obj = self.pool.get('ir.rule')
apply_rule(*rule_obj.domain_get(cr, uid, self._name, mode, context=context))
# apply ir.rules from the parents (through _inherits), adding the appropriate JOINs if needed
# apply ir.rules from the parents (through _inherits)
for inherited_model in self._inherits:
if apply_rule(*rule_obj.domain_get(cr, uid, inherited_model, mode, context=context)):
# if some rules were applied, need to add the missing JOIN for them to make sense, passing the previous
# list of table in case the inherited table was not in the list before (as that means the corresponding
# JOIN(s) was(were) not present)
self._inherits_join_add(inherited_model, query)
apply_rule(*rule_obj.domain_get(cr, uid, inherited_model, mode, context=context),
parent_model=inherited_model,
child_object=self)
def _generate_m2o_order_by(self, order_field, query):
"""