[FIX] web: MockServer: read_group __domain

read_group returns a __domain for each group, which is the
conjunction of the domain given for the read_group with the domain
matching the given group.

The MockServer didn't reproduce that behavior.

Moreover, the BasicModel did again that conjunction, leading to
domains with redundant subdomains.

3 files changed, 3 insertions, 3 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 010cc37d8d6..19500a0e442 100644
--- a/addons/web/static/src/js/views/basic/basic_model.js
+++ b/addons/web/static/src/js/views/basic/basic_model.js
@@ -2072,7 +2072,7 @@ var BasicModel = AbstractModel.extend({
                     var newGroup = self._makeDataPoint({
                         modelName: list.model,
                         count: group[rawGroupBy + '_count'],
-                        domain: list.domain.concat(group.__domain),
+                        domain: group.__domain,
                         context: list.context,
                         fields: list.fields,
                         fieldNames: list.fieldNames,
diff --git a/addons/web/static/test/helpers/mock_server.js b/addons/web/static/test/helpers/mock_server.js
index 4b662f4a979..ee1538feaa4 100644
--- a/addons/web/static/test/helpers/mock_server.js
+++ b/addons/web/static/test/helpers/mock_server.js
@@ -601,7 +601,7 @@ var MockServer = Class.extend({
                     __domain: [[
                         groupByField, "=",
                         val instanceof Array ? val[0] : (val || false)
-                    ]]
+                    ]].concat(kwargs.domain || []),
                 };
                 var field = self.data[model].fields[groupByField];
                 if (field.type === 'many2one' && !_.isArray(val)) {
diff --git a/addons/web/static/test/views/list_tests.js b/addons/web/static/test/views/list_tests.js
index 13a0b2555fd..87f361a3456 100644
--- a/addons/web/static/test/views/list_tests.js
+++ b/addons/web/static/test/views/list_tests.js
@@ -1107,7 +1107,7 @@ QUnit.module('Views', {
                     nbRPCs.readGroup++;
                 } else if (route === '/web/dataset/search_read') {
                     // called twice (once when opening the group, once when sorting)
-                    assert.deepEqual(args.domain, [['m2o', '=', 1], ['foo', '=', 'blip']],
+                    assert.deepEqual(args.domain, [['foo', '=', 'blip'], ['m2o', '=', 1]],
                         "nested search_read should be called with correct domain");
                     nbRPCs.searchRead++;
                 }