diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-01-08 17:08:48 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-01-08 17:08:48 +0100 |
| commit | 3e4138deaa23b3631dc3fce33cd6d1b3be28ffbd (patch) | |
| tree | 8f8b5557363374af71baeeea97d4565a7ca1cce1 /addons/web/static/src/js/views/basic/basic_model.js | |
| parent | 232675c49b8cabdedce98b9b9c2ccc6d963b4d9a (diff) | |
| parent | 2d824a5b7ad9e2d834bb39feb79c986eba28d6cc (diff) | |
[MERGE] forward port branch saas-11.3 up to 2d824a5b7ad
Diffstat (limited to 'addons/web/static/src/js/views/basic/basic_model.js')
| -rw-r--r-- | addons/web/static/src/js/views/basic/basic_model.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/views/basic/basic_model.js b/addons/web/static/src/js/views/basic/basic_model.js index 865cddba657..5bb7d01fe3d 100644 --- a/addons/web/static/src/js/views/basic/basic_model.js +++ b/addons/web/static/src/js/views/basic/basic_model.js @@ -1862,7 +1862,7 @@ var BasicModel = AbstractModel.extend({ model: list.model, method: 'read', args: [_.pluck(data, 'id'), fieldNames], - context: record.context, + context: _.extend({}, record.context, field.context), }).then(function (records) { _.each(records, function (record) { list_records[record.id].data = record; @@ -2724,7 +2724,7 @@ var BasicModel = AbstractModel.extend({ var ids = record.data[fieldName] || []; var list = self._makeDataPoint({ count: ids.length, - context: record.context, + context: _.extend({}, record.context, field.context), fieldsInfo: fieldsInfo, fields: view ? view.fields : fieldInfo.relatedFields, limit: fieldInfo.limit, |