Techsystech
/
web_techsystech
forked from Techsystech/web
3
0
Fork 0
Code Pull Requests Activity

[IMP] more readable code

7.0
Holger Brunn 2015-03-02 10:28:00 +01:00
parent 487f31b9ba
commit c9275a8817
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
web_advanced_filters/model/ir_filters.py
View File

@ -70,16 +70,13 @@ class IrFilters(Model):
'model_id'], 'model_id'],
context=context): context=context):
if c['evaluate_before_negate']: if c['evaluate_before_negate']:
matching_ids = self.pool[c['model_id']].search(
cr, uid, eval_n(c['domain']),
context=context)
domain = expression.AND([ domain = expression.AND([
domain, domain,
[ [('id', 'not in', matching_ids)],
[ ])
'id', 'not in',
self.pool[c['model_id']].search(
cr, uid, eval_n(c['domain']),
context=context)
]
]])
else: else:
domain = expression.AND([ domain = expression.AND([
domain, domain,
@ -101,7 +98,8 @@ class IrFilters(Model):
context=context): context=context):
result[this['id']] = False result[this['id']] = False
complement_domain = expression.normalize_domain( complement_domain = expression.normalize_domain(
safe_eval(this['domain'] or 'False') or [expression.FALSE_LEAF]) safe_eval(this['domain'] or 'False') or
[expression.FALSE_LEAF])
for arg in complement_domain: for arg in complement_domain:
if not expression.is_leaf(arg): if not expression.is_leaf(arg):
continue continue