[MERGE] forward port branch saas-11.3 up to 2d824a5b7a

2019-01-08 17:08:48 +01:00
parent 232675c49b 2d824a5b7a
commit 3e4138deaa
15 changed files with 1582 additions and 1559 deletions
@@ -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,