From fc8cfc57627bf57686b7e93749c8b4f9a05622f5 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Mon, 13 Mar 2017 11:54:30 +0100
Subject: [PATCH] [FIX] web: fix crash in one2many in one2many

Before this fix we can not use a one2many field in a list view one2many
field, because the one2many and many2many were not converted to datapoint.
---
 .../static/src/js/views/basic/basic_model.js  | 21 +++++++++
 .../test/fields/relational_fields_tests.js    | 45 +++++++++++++++++++
 2 files changed, 66 insertions(+)

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 afac5c1c5ff..2cfa96a3015 100644
--- a/addons/web/static/src/js/views/basic/basic_model.js
+++ b/addons/web/static/src/js/views/basic/basic_model.js
@@ -2110,6 +2110,27 @@ var BasicModel = AbstractModel.extend({
                     // add many2one records
                     self._parseServerData(list.fieldNames, dataPoint.fields, dataPoint.data);
                     list._cache[id] = dataPoint.id;
+
+                    _.each(list.fieldNames, function (fieldName) {
+                        var field = dataPoint.fields[fieldName];
+                        var val = dataPoint.data[fieldName];
+                        if (field.type === 'one2many' || field.type === 'many2many') {
+                            var r = self._makeDataPoint({
+                                count: val.length,
+                                fieldAttrs: field.fieldAttrs,
+                                fields: field.relatedFields,
+                                limit: field.limit,
+                                modelName: field.relation,
+                                res_ids: val,
+                                static: true,
+                                type: 'list',
+                                parentID: list.id,
+                                rawContext: field.context,
+                                relationField: field.relation_field,
+                            });
+                            dataPoint.data[fieldName] = r.id;
+                        }
+                    });
                 }
                 list.data.push(dataPoint.id);
             });
diff --git a/addons/web/static/test/fields/relational_fields_tests.js b/addons/web/static/test/fields/relational_fields_tests.js
index 5ef4d75591d..a7e6f12e40f 100644
--- a/addons/web/static/test/fields/relational_fields_tests.js
+++ b/addons/web/static/test/fields/relational_fields_tests.js
@@ -94,18 +94,21 @@ QUnit.module('relational_fields', {
                     turtle_qux: {string: "Qux", type: "float", digits: [16,1], required: true, default: 1.5},
                     turtle_trululu: {string: "Trululu", type: "many2one", relation: 'partner'},
                     product_id: {string: "Product", type: "many2one", relation: 'product', required: true},
+                    partner_ids: {string: "Partner", type: "one2many", relation: 'partner'},
                 },
                 records: [{
                     id: 1,
                     display_name: "leonardo",
                     turtle_bar: true,
                     turtle_foo: "yop",
+                    partner_ids: [],
                 }, {
                     id: 2,
                     display_name: "donatello",
                     turtle_bar: true,
                     turtle_foo: "blip",
                     turtle_int: 9,
+                    partner_ids: [2,4],
                 }, {
                     id: 3,
                     display_name: "raphael",
@@ -113,6 +116,7 @@ QUnit.module('relational_fields', {
                     turtle_foo: "kawa",
                     turtle_int: 21,
                     turtle_qux: 9.8,
+                    partner_ids: [],
                 }],
             }
         };
@@ -1976,6 +1980,47 @@ QUnit.module('relational_fields', {
         form.destroy();
     });
 
+    QUnit.test('one2many inception part 1', function (assert) {
+        assert.expect(2);
+
+        this.data.turtle.records[1].product_id = 37;
+        this.data.partner.records[0].turtles = [2,3];
+        this.data.partner.records[2].turtles = [1,3];
+
+        var form = createView({
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch: '<form string="Partners">' +
+                    '<group>' +
+                        '<field name="int_field"/>' +
+                        '<field name="turtles">' +
+                            '<form string="Turtles">' +
+                                '<group>' +
+                                    '<field name="product_id"/>' +
+                                '</group>' +
+                            '</form>' +
+                            '<tree>' +
+                                '<field name="display_name"/>' +
+                                '<field name="partner_ids"/>' +
+                            '</tree>' +
+                        '</field>' +
+                    '</group>' +
+                '</form>',
+            res_id: 1,
+        });
+
+        assert.strictEqual(form.$('.o_data_row').length, 2,
+            'should display the 2 turtles');
+
+        form.$('.o_data_row:first').click();
+
+        assert.strictEqual($('.modal .o_form_field').text(), "xphone",
+            'should display the form view dialog with the many2one value');
+
+        form.destroy();
+    });
+
     QUnit.module('FieldMany2Many');
 
     QUnit.test('many2many kanban: edition', function (assert) {