summaryrefslogtreecommitdiff
path: root/addons/base_sparse_field
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-08-21 16:00:40 +0200
committerChristophe Simonis <chs@odoo.com>2018-08-21 16:00:40 +0200
commitfbfb91799eecc5297ab6c86b657bf213343f6cd8 (patch)
treed7af2e04f2667e61d887a02b2c5d205d064d8d83 /addons/base_sparse_field
parent65c2a9b70c4313af8bf80ee633e55e176df8baf0 (diff)
parent9cf0dbe22676d793971364ed31e6c28fa5329585 (diff)
[MERGE] forward port branch saas-15 up to 9cf0dbe2267
Diffstat (limited to 'addons/base_sparse_field')
-rw-r--r--addons/base_sparse_field/models/models.py2
-rw-r--r--addons/base_sparse_field/views/views.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/base_sparse_field/models/models.py b/addons/base_sparse_field/models/models.py
index 77ea36a6bd8..703c6466ee9 100644
--- a/addons/base_sparse_field/models/models.py
+++ b/addons/base_sparse_field/models/models.py
@@ -9,7 +9,7 @@ class IrModelFields(models.Model):
ttype = fields.Selection(selection_add=[('serialized', 'serialized')])
serialization_field_id = fields.Many2one('ir.model.fields', string='Serialization Field',
- ondelete='cascade', domain="[('ttype','=','serialized')]",
+ ondelete='cascade', domain="[('ttype','=','serialized'), ('model_id', '=', model_id)]",
help="If set, this field will be stored in the sparse structure of the "
"serialization field, instead of having its own database column. "
"This cannot be changed after creation.",
diff --git a/addons/base_sparse_field/views/views.xml b/addons/base_sparse_field/views/views.xml
index 95c3d23634a..eaf684247af 100644
--- a/addons/base_sparse_field/views/views.xml
+++ b/addons/base_sparse_field/views/views.xml
@@ -22,7 +22,7 @@
<field name="arch" type="xml">
<field name="related" position="before">
<field name="serialization_field_id"
- domain="[('ttype','=','serialized'), ('model_id','=',model_id)]"
+ context="{'default_model_id': model_id, 'default_ttype': 'serialized'}"
attrs="{'readonly': [('state','=','base')]}"/>
</field>
</field>