From dcae3b64a3653f3befc1e53fc140eaac85f7b05e Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 11 Oct 2012 14:22:14 +0200 Subject: [PATCH] [REVERT] removed server-side evaluation of field options bzr revid: nicolas.vanhoren@openerp.com-20121011122214-ab1mqyz9h8jnq7ql --- openerp/osv/orm.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index 7545fd5f4b2..cf9dc024dcb 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -66,7 +66,6 @@ import openerp.tools as tools from openerp.tools.config import config from openerp.tools.misc import CountingStream from openerp.tools.safe_eval import safe_eval as eval -from ast import literal_eval from openerp.tools.translate import _ from openerp import SUPERUSER_ID from query import Query @@ -1812,13 +1811,7 @@ class BaseModel(object): field = model_fields.get(node.get('name')) if field: transfer_field_to_modifiers(field, modifiers) - #evaluate the options as python code, but send it as json to the client - if node.get('options'): - try: - node.set('options', simplejson.dumps(literal_eval(node.get('options')))) - except Exception, e: - _logger.exception('Invalid `options´ attribute, should be a valid python expression: %r', node.get('options')) - raise except_orm('Invalid options', 'Invalid options: %r %s' % (node.get('options'), e)) + elif node.tag in ('form', 'tree'): result = self.view_header_get(cr, user, False, node.tag, context)