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

[FIX] use safe_eval instead of const_eval

7.0
Holger Brunn 2014-07-28 17:30:32 +02:00
parent 22cc578a4d
commit 85b9ce07d4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
advanced_filters/model/ir_filters.py
View File

@ -21,7 +21,7 @@
import itertools import itertools
from openerp.osv.orm import Model from openerp.osv.orm import Model
from openerp.osv import fields, expression from openerp.osv import fields, expression
from openerp.tools.safe_eval import const_eval from openerp.tools.safe_eval import safe_eval
from openerp.tools.translate import _ from openerp.tools.translate import _
@ -32,7 +32,7 @@ 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 = const_eval(this.domain) domain = safe_eval(this.domain)
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')
@ -44,7 +44,7 @@ class IrFilters(Model):
def eval_n(domain): def eval_n(domain):
'''parse a domain and normalize it''' '''parse a domain and normalize it'''
return expression.normalize_domain( return expression.normalize_domain(
const_eval(domain) or [expression.FALSE_LEAF]) safe_eval(domain) or [expression.FALSE_LEAF])
result = {} result = {}
for this in self.read( for this in self.read(
cr, uid, ids, cr, uid, ids,
@ -95,7 +95,7 @@ class IrFilters(Model):
assert len(ids) == 1 assert len(ids) == 1
this = self.browse(cr, uid, ids[0], context=context) this = self.browse(cr, uid, ids[0], context=context)
return self.pool[this.model_id].search( return self.pool[this.model_id].search(
cr, uid, const_eval(this.domain), context=const_eval(this.context)) cr, uid, safe_eval(this.domain), context=safe_eval(this.context))
def button_save(self, cr, uid, ids, context=None): def button_save(self, cr, uid, ids, context=None):
return {'type': 'ir.actions.act_window.close'} return {'type': 'ir.actions.act_window.close'}