3
0
Fork 0

Merge branch '7.0-advanced_filters' of github.com:hbrunn/web into 7.0-advanced_filters

Conflicts:
	web_advanced_filters/model/ir_filters.py
7.0
Holger Brunn 2015-03-02 10:28:44 +01:00
commit a98ba6072a
1 changed files with 2 additions and 2 deletions

View File

@ -98,8 +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 safe_eval(this['domain'] or 'False')
[expression.FALSE_LEAF]) 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