From d7eb116fa8b9d5e9cd75f628a3a9e6e53fcbd744 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= <ged@odoo.com>
Date: Tue, 28 Feb 2017 16:17:28 +0100
Subject: [FIX] web: properly compute contexts in some cases

When we have a many2one widget in a one2many, editable, the context was
not properly computed: it expected the parent to be a record object, but
in that case, it is a list object.
---
 addons/web/static/src/js/views/basic/basic_model.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'addons/web/static/src')

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 c5d212ff930..5f1e6ccbb9c 100644
--- a/addons/web/static/src/js/views/basic/basic_model.js
+++ b/addons/web/static/src/js/views/basic/basic_model.js
@@ -1555,6 +1555,9 @@ var BasicModel = AbstractModel.extend({
         var evalContext = this.get(element.id, {raw: true}).data;
         if (element.parentID) {
             var parent = this.get(element.parentID, {raw: true});
+            if (parent.type === 'list' && this.localData[element.parentID].parentID) {
+                parent = this.get(this.localData[element.parentID].parentID, {raw: true});
+            }
             _.extend(evalContext, {parent: parent.data});
         }
         context.set_eval_context(evalContext);
@@ -1846,11 +1849,12 @@ var BasicModel = AbstractModel.extend({
                     dataPoint = self.localData[list._cache[id]];
                 } else {
                     dataPoint = self._makeDataPoint({
-                        modelName: list.model,
                         data: _.findWhere(records, {id: id}),
-                        fields: list.fields,
-                        fieldNames: list.fieldNames,
                         fieldAttrs: list.fieldAttrs,
+                        fieldNames: list.fieldNames,
+                        fields: list.fields,
+                        modelName: list.model,
+                        parentID: list.id,
                     });
 
                     // add many2one records
@@ -1862,7 +1866,8 @@ var BasicModel = AbstractModel.extend({
                                 data: {
                                     id: dataPoint.data[name][0],
                                     display_name: dataPoint.data[name][1],
-                                }
+                                },
+                                parentID: dataPoint.id,
                             });
 
                             dataPoint.data[name] = r.id;
@@ -1905,6 +1910,7 @@ var BasicModel = AbstractModel.extend({
                     fieldNames: list.fieldNames,
                     fieldAttrs: list.fieldAttrs,
                     modelName: list.model,
+                    parentID: list.id,
                 });
 
                 // add many2one records
-- 
cgit v1.2.3