From 870aa81ad9ef26b88bff8190a71e8c805fe33beb Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Fri, 11 Aug 2017 08:46:11 +0200
Subject: [FIX] web: BasicModel: default_get: handle false value for o2m

The value for one2many fields returned by default_get may be a
list of commands, or directly a list of ids. These cases were
correctly handled. However, it seems that the value can also be
false, and when this happened, it crashed. For instance, go to
Sales > Leads (must be activated in the Settings) > in the list
view, check several leads > in 'Action', click on 'Convert to
Opportunities' > crash.
---
 addons/web/static/tests/views/basic_model_tests.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'addons/web/static/tests/views/basic_model_tests.js')

diff --git a/addons/web/static/tests/views/basic_model_tests.js b/addons/web/static/tests/views/basic_model_tests.js
index 8c23fc4f97c..98f895969a4 100644
--- a/addons/web/static/tests/views/basic_model_tests.js
+++ b/addons/web/static/tests/views/basic_model_tests.js
@@ -2007,5 +2007,25 @@ QUnit.module('Views', {
         model.destroy();
     });
 
+    QUnit.test('default_get with value false for a one2many', function (assert) {
+        assert.expect(1);
+
+        this.data.partner.fields.product_ids.default = false;
+        this.params.fieldNames = ['product_ids'];
+        this.params.res_id = undefined;
+        this.params.type = 'record';
+
+        var model = createModel({
+            Model: BasicModel,
+            data: this.data,
+        });
+
+        model.load(this.params).then(function (resultID) {
+            var record = model.get(resultID);
+            assert.deepEqual(record.data.product_ids.data, [], "o2m default should be []");
+        });
+
+        model.destroy();
+    });
 
 });});
-- 
cgit v1.2.3


From 4efa4e9d9420d0283c8d7b9683d13d3cd0907400 Mon Sep 17 00:00:00 2001
From: Martin Geubelle <mge@odoo.com>
Date: Thu, 17 Aug 2017 18:37:25 +0200
Subject: [FIX] web: BasicModel: default_get: correctly fetch m2o inside o2m

In general (e.g. read, search_read), values for many2one fields are pairs
[id, display_name]. The default_get is an exception, it only returns the id,
so we need to manually perform a name_get afterwards. In the case of
list views, those name_get RPCs are batched.

Before this rev., the code in charge of it didn't handle the case where the
many2one value was false, so it crashed when it happened.

This rev. deals with this use case and a test case has been added.
---
 addons/web/static/tests/views/basic_model_tests.js | 58 ++++++++++++++++++++++
 1 file changed, 58 insertions(+)

(limited to 'addons/web/static/tests/views/basic_model_tests.js')

diff --git a/addons/web/static/tests/views/basic_model_tests.js b/addons/web/static/tests/views/basic_model_tests.js
index 98f895969a4..318b715a504 100644
--- a/addons/web/static/tests/views/basic_model_tests.js
+++ b/addons/web/static/tests/views/basic_model_tests.js
@@ -1323,6 +1323,64 @@ QUnit.module('Views', {
         model.destroy();
     });
 
+    QUnit.test('default_get: fetch many2one with default (empty & not) inside x2manys', function (assert) {
+        assert.expect(4);
+
+        this.data.partner.fields.o2m = {
+            string: "O2M", type: 'one2many', relation: 'partner', default: [
+                [6, 0, []],
+                [0, 0, {category: false}],
+                [0, 0, {category: 12}],
+            ],
+        };
+        this.data.partner.fields.category.type = 'many2one';
+
+        var model = createModel({
+            Model: BasicModel,
+            data: this.data,
+            mockRPC: function (route, args) {
+                if (args.method === 'name_get' && args.model === 'partner_type') {
+                    assert.deepEqual(args.args, [[12]], "should name_get on category 12");
+                }
+                return this._super(route, args);
+            },
+        });
+
+        var params = {
+            fieldNames: ['o2m'],
+            fields: this.data.partner.fields,
+            fieldsInfo: {
+                form: {
+                    o2m: {
+                        relatedFields: this.data.partner.fields,
+                        fieldsInfo: {
+                            list: {
+                                category: {
+                                    relatedFields: { display_name: {} },
+                                },
+                            },
+                        },
+                        viewType: 'list',
+                    },
+                },
+            },
+            modelName: 'partner',
+            type: 'record',
+            viewType: 'form',
+        };
+
+        model.load(params).then(function (resultID) {
+            var record = model.get(resultID);
+            assert.strictEqual(record.data.o2m.count, 2, "o2m field should contain 2 records");
+            assert.strictEqual(record.data.o2m.data[0].data.category, false,
+                "first category field should be empty");
+            assert.strictEqual(record.data.o2m.data[1].data.category.data.display_name, "gold",
+                "second category field should have been correctly fetched");
+        });
+
+        model.destroy();
+    });
+
     QUnit.test('default_get: fetch x2manys inside x2manys', function (assert) {
         assert.expect(3);
 
-- 
cgit v1.2.3