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

[FIX] cope with faulty expressions in filters

12.0
Holger Brunn 2014-11-24 16:04:27 +01:00 committed by Jan Verbeek
parent ced4e21fcf
commit 80b82f0bc7
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web_advanced_filters/model/ir_filters.py
View File

@ -32,7 +32,10 @@ class IrFilters(Model):
'''determine if this is fixed list of ids''' '''determine if this is fixed list of ids'''
result = {} result = {}
for this in self.browse(cr, uid, ids, context=context): for this in self.browse(cr, uid, ids, context=context):
domain = safe_eval(this.domain) try:
domain = safe_eval(this.domain)
except:
domain = [expression.FALSE_LEAF]
result[this.id] = (len(domain) == 1 and result[this.id] = (len(domain) == 1 and
expression.is_leaf(domain[0]) and expression.is_leaf(domain[0]) and
domain[0][0] == 'id') domain[0][0] == 'id')
@ -43,8 +46,13 @@ class IrFilters(Model):
this works recursively''' this works recursively'''
def eval_n(domain): def eval_n(domain):
'''parse a domain and normalize it''' '''parse a domain and normalize it'''
try:
domain = safe_eval(domain)
except:
domain = [expression.FALSE_LEAF]
return expression.normalize_domain( return expression.normalize_domain(
safe_eval(domain) or [expression.FALSE_LEAF]) domain or [expression.FALSE_LEAF])
result = {} result = {}
for this in self.read( for this in self.read(
cr, uid, ids, cr, uid, ids,