summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorAaron Bohy <aab@odoo.com>2017-03-16 16:44:32 +0100
committerAaron Bohy <aab@odoo.com>2017-04-11 19:44:38 +0200
commit6e1875ac7e9a6fea9c44d00b3fe7a2c23c9bbb6f (patch)
treee227fcba93a0f2fef6250c12dbcb671e5887b828 /addons/web/static/src
parente1b68dae50a0ffd8eadeafd823acb328c429b7fe (diff)
[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.
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/views/basic/basic_model.js2
1 files changed, 1 insertions, 1 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,