From 31d05360b22860041b7341643bcbc7c4b9c6bbd4 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Wed, 19 Jun 2013 11:13:32 +0200 Subject: [PATCH] [REF] fields: removed deprecated view_load attribute and removed useless first argument in property fields definition bzr revid: qdp-launchpad@openerp.com-20130619091332-29pisdnyfemn1u3d --- doc/03_module_dev_02.rst | 1 - openerp/addons/base/base.sql | 1 - openerp/addons/base/ir/ir_model.py | 3 --- openerp/addons/base/res/ir_property.py | 2 +- openerp/osv/fields.py | 11 ++++++----- openerp/osv/orm.py | 11 +++++------ 6 files changed, 12 insertions(+), 17 deletions(-) diff --git a/doc/03_module_dev_02.rst b/doc/03_module_dev_02.rst index 9c00df6223e..223c82d3f1c 100644 --- a/doc/03_module_dev_02.rst +++ b/doc/03_module_dev_02.rst @@ -843,7 +843,6 @@ A property is a special field: fields.property. relation='product.pricelist', string="Sale Pricelist", method=True, - view_load=True, group_name="Pricelists Properties"), } diff --git a/openerp/addons/base/base.sql b/openerp/addons/base/base.sql index b1ddb2eec70..e91e4516b1a 100644 --- a/openerp/addons/base/base.sql +++ b/openerp/addons/base/base.sql @@ -42,7 +42,6 @@ CREATE TABLE ir_model_fields ( field_description varchar(256), ttype varchar(64), state varchar(64) default 'base', - view_load boolean, relate boolean default False, relation_field varchar(128), translate boolean default False, diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py index 165fd8a4be9..7eb4f5ecd94 100644 --- a/openerp/addons/base/ir/ir_model.py +++ b/openerp/addons/base/ir/ir_model.py @@ -245,7 +245,6 @@ class ir_model_fields(osv.osv): "specified as a Python expression defining a list of triplets. " "For example: [('color','=','red')]"), 'groups': fields.many2many('res.groups', 'ir_model_fields_group_rel', 'field_id', 'group_id', 'Groups'), - 'view_load': fields.boolean('View Auto-Load'), 'selectable': fields.boolean('Selectable'), 'modules': fields.function(_in_modules, type='char', size=128, string='In Modules', help='List of modules in which the field is defined'), 'serialization_field_id': fields.many2one('ir.model.fields', 'Serialization Field', domain = "[('ttype','=','serialized')]", @@ -256,7 +255,6 @@ class ir_model_fields(osv.osv): } _rec_name='field_description' _defaults = { - 'view_load': 0, 'selection': "", 'domain': "[]", 'name': 'x_', @@ -386,7 +384,6 @@ class ir_model_fields(osv.osv): ('size', 'size', int), ('on_delete', 'ondelete', str), ('translate', 'translate', bool), - ('view_load', 'view_load', bool), ('selectable', 'selectable', bool), ('select_level', 'select', int), ('selection', 'selection', eval), diff --git a/openerp/addons/base/res/ir_property.py b/openerp/addons/base/res/ir_property.py index 5ec4f98c3b8..f4e53ba3293 100644 --- a/openerp/addons/base/res/ir_property.py +++ b/openerp/addons/base/res/ir_property.py @@ -35,7 +35,7 @@ class ir_property(osv.osv): def _models_field_get(self, cr, uid, field_key, field_value, context=None): get = attrgetter(field_key, field_value) obj = self.pool.get('ir.model.fields') - ids = obj.search(cr, uid, [('view_load','=',1)], context=context) + ids = obj.search(cr, uid, [], context=context) res = set() for o in obj.browse(cr, uid, ids, context=context): res.add(get(o)) diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py index f38d1efa0cc..0ff78c69204 100644 --- a/openerp/osv/fields.py +++ b/openerp/osv/fields.py @@ -109,7 +109,6 @@ class _column(object): self._context = context self.write = False self.read = False - self.view_load = 0 self.select = select self.manual = manual self.selectable = True @@ -1477,11 +1476,13 @@ class property(function): self.field_id[cr.dbname] = res and res[0] return self.field_id[cr.dbname] - def __init__(self, obj_prop, **args): - # TODO remove obj_prop parameter (use many2one type) + + def __init__(self, **args): self.field_id = {} - function.__init__(self, self._fnct_read, False, self._fnct_write, - obj_prop, multi='properties', **args) + if 'view_load' in args: + _logger.warning("view_load attribute is deprecated on ir.fields. Args: %r", args) + obj = 'relation' in args and args['relation'] or '' + function.__init__(self, self._fnct_read, False, self._fnct_write, obj=obj, multi='properties', **args) def restart(self): self.field_id = {} diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index 0dad128dfad..eb5f637622b 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -773,7 +773,6 @@ class BaseModel(object): 'field_description': f.string, 'ttype': f._type, 'relation': f._obj or '', - 'view_load': (f.view_load and 1) or 0, 'select_level': tools.ustr(f.select or 0), 'readonly': (f.readonly and 1) or 0, 'required': (f.required and 1) or 0, @@ -803,12 +802,12 @@ class BaseModel(object): vals['id'] = id cr.execute("""INSERT INTO ir_model_fields ( id, model_id, model, name, field_description, ttype, - relation,view_load,state,select_level,relation_field, translate, serialization_field_id + relation,state,select_level,relation_field, translate, serialization_field_id ) VALUES ( - %s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s + %s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s )""", ( id, vals['model_id'], vals['model'], vals['name'], vals['field_description'], vals['ttype'], - vals['relation'], bool(vals['view_load']), 'base', + vals['relation'], 'base', vals['select_level'], vals['relation_field'], bool(vals['translate']), vals['serialization_field_id'] )) if 'module' in context: @@ -826,11 +825,11 @@ class BaseModel(object): cr.commit() cr.execute("""UPDATE ir_model_fields SET model_id=%s, field_description=%s, ttype=%s, relation=%s, - view_load=%s, select_level=%s, readonly=%s ,required=%s, selectable=%s, relation_field=%s, translate=%s, serialization_field_id=%s + select_level=%s, readonly=%s ,required=%s, selectable=%s, relation_field=%s, translate=%s, serialization_field_id=%s WHERE model=%s AND name=%s""", ( vals['model_id'], vals['field_description'], vals['ttype'], - vals['relation'], bool(vals['view_load']), + vals['relation'], vals['select_level'], bool(vals['readonly']), bool(vals['required']), bool(vals['selectable']), vals['relation_field'], bool(vals['translate']), vals['serialization_field_id'], vals['model'], vals['name'] )) break