From c39f1cca46ccd6b75ab32d071f1322328428f5dd Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Tue, 29 Mar 2011 13:38:24 +0200 Subject: [PATCH] [FIX] orm,ir.model: add eval of domain for relationship fields Without this, it has become impossible to add one2many fields as custom fields, because the domain string is not evaluated bzr revid: odo@openerp.com-20110329113824-5ca5bvp1awzies5u --- openerp/addons/base/ir/ir_model.py | 4 ++-- openerp/osv/orm.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py index 5ce50370c77..794c419dafd 100644 --- a/openerp/addons/base/ir/ir_model.py +++ b/openerp/addons/base/ir/ir_model.py @@ -303,10 +303,10 @@ class ir_model_fields(osv.osv): # static table of properties model_props = [ # (our-name, fields.prop, set_fn) - ('field_description', 'string', lambda a: a), + ('field_description', 'string', str), ('required', 'required', bool), ('readonly', 'readonly', bool), - ('domain', '_domain', lambda a: a), + ('domain', '_domain', eval), ('size', 'size', int), ('on_delete', 'ondelete', str), ('translate', 'translate', bool), diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index 9ecf547969f..b60d9547869 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -2818,7 +2818,7 @@ class orm(orm_template): 'string': field['field_description'], 'required': bool(field['required']), 'readonly': bool(field['readonly']), - 'domain': field['domain'] or None, + 'domain': eval(field['domain']) if field['domain'] else None, 'size': field['size'], 'ondelete': field['on_delete'], 'translate': (field['translate']),