[FIX] models: callable in api.depends() sees valid _rec_name

Determine `model._rec_name` before the dependencies of the fields.  The
compute method of the automatic field `display_name` uses a callable
depends that retrieves `model._rec_name`.

closes odoo/odoo#36479

Signed-off-by: Raphael Collet (rco) <rco@openerp.com>
This commit is contained in:
Raphael Collet
2019-09-06 09:02:51 +00:00
parent 7c28c97724
commit f048652ca7
3 changed files with 22 additions and 15 deletions
@@ -74,6 +74,13 @@ class TestFields(common.TransactionCase):
field = self.env['test_new_api.message']._fields['x_bool_false_computed']
self.assertFalse(field.depends)
def test_10_display_name(self):
""" test definition of automatic field 'display_name' """
field = type(self.env['test_new_api.discussion']).display_name
self.assertTrue(field.automatic)
self.assertTrue(field.compute)
self.assertEqual(field.depends, ('name',))
def test_10_non_stored(self):
""" test non-stored fields """
# a field declared with store=False should not have a column
+6 -6
View File
@@ -478,6 +478,10 @@ class Field(MetaField('DummyField', (object,), {})):
def _setup_regular_base(self, model):
""" Setup the attributes of a non-related field. """
pass
def _setup_regular_full(self, model):
""" Determine the dependencies and inverse field(s) of ``self``. """
def make_depends(deps):
return tuple(deps(model) if callable(deps) else deps)
@@ -489,10 +493,6 @@ class Field(MetaField('DummyField', (object,), {})):
else:
self.depends = make_depends(getattr(self.compute, '_depends', ()))
def _setup_regular_full(self, model):
""" Setup the inverse field(s) of ``self``. """
pass
#
# Setup of related fields
#
@@ -2182,8 +2182,8 @@ class _RelationalMulti(_Relational):
for record in records:
record[self.name] = record[self.name].filtered(accessible)
def _setup_regular_base(self, model):
super(_RelationalMulti, self)._setup_regular_base(model)
def _setup_regular_full(self, model):
super(_RelationalMulti, self)._setup_regular_full(model)
if isinstance(self.domain, list):
self.depends += tuple(
self.name + '.' + arg[0]
+9 -9
View File
@@ -2414,6 +2414,15 @@ class BaseModel(MetaModel('DummyModel', (object,), {'_register': False})):
cls._setup_done = True
# 5. determine and validate rec_name
if cls._rec_name:
assert cls._rec_name in cls._fields, \
"Invalid rec_name %s for model %s" % (cls._rec_name, cls._name)
elif 'name' in cls._fields:
cls._rec_name = 'name'
elif 'x_name' in cls._fields:
cls._rec_name = 'x_name'
@api.model
def _setup_fields(self):
""" Setup the fields, except for recomputation triggers. """
@@ -2466,15 +2475,6 @@ class BaseModel(MetaModel('DummyModel', (object,), {'_register': False})):
# register constraints and onchange methods
cls._init_constraints_onchanges()
# validate rec_name
if cls._rec_name:
assert cls._rec_name in cls._fields, \
"Invalid rec_name %s for model %s" % (cls._rec_name, cls._name)
elif 'name' in cls._fields:
cls._rec_name = 'name'
elif 'x_name' in cls._fields:
cls._rec_name = 'x_name'
# make sure parent_order is set when necessary
if cls._parent_store and not cls._parent_order:
cls._parent_order = cls._order