Techsystech
/
web
mirror of https://github.com/OCA/web.git
3
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

[FIX] use safe_eval to account for names like False

pull/29/head
Holger Brunn 2014-11-24 15:53:02 +01:00
parent a912bb470f
commit fcd77d206c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web_advanced_filters/wizard/ir_filters_combine_with_existing.py
View File

@ -21,7 +21,7 @@
import time
from openerp.osv.orm import TransientModel
from openerp.osv import fields, expression
from openerp.tools.safe_eval import const_eval
from openerp.tools.safe_eval import safe_eval
class IrFiltersCombineWithExisting(TransientModel):
@ -41,7 +41,7 @@ class IrFiltersCombineWithExisting(TransientModel):
def button_save(self, cr, uid, ids, context=None):
assert len(ids) == 1
this = self.browse(cr, uid, ids[0], context=context)
domain = const_eval(this.domain)
domain = safe_eval(this.domain)
is_frozen = (len(domain) == 1 and
expression.is_leaf(domain[0]) and
domain[0][0] == 'id')
@ -49,7 +49,7 @@ class IrFiltersCombineWithExisting(TransientModel):
if this.action == 'union':
if is_frozen and this.filter_id.is_frozen:
domain[0][2] = list(set(domain[0][2]).union(
set(const_eval(this.filter_id.domain)[0][2])))
set(safe_eval(this.filter_id.domain)[0][2])))
this.filter_id.write({'domain': str(domain)})
else:
this.filter_id.write(
@ -66,7 +66,7 @@ class IrFiltersCombineWithExisting(TransientModel):
})
elif this.action == 'complement':
if is_frozen and this.filter_id.is_frozen:
complement_set = set(const_eval(this.filter_id.domain)[0][2])
complement_set = set(safe_eval(this.filter_id.domain)[0][2])
domain[0][2] = list(
complement_set.difference(set(domain[0][2])))
this.filter_id.write({'domain': str(domain)})