diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-11-28 15:12:31 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-11-28 15:12:31 +0100 |
| commit | 5851a69aa3ac2b140ffccdbe43427cdad3e74e0c (patch) | |
| tree | 2da1f6c4d65f4466bc8c263328ae55b007ca6da7 /addons/web/static/src/js/core | |
| parent | 41d2470093a5e18ecebc86f2f878813f1879462d (diff) | |
| parent | 3f66814a0d01a81bef5456a07da4b1ac8e2281e7 (diff) | |
[MERGE] forward port branch saas-16 up to 3f66814a0d0
Diffstat (limited to 'addons/web/static/src/js/core')
| -rw-r--r-- | addons/web/static/src/js/core/rpc.js | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/addons/web/static/src/js/core/rpc.js b/addons/web/static/src/js/core/rpc.js index 6ad91c0e4f9..53d298c9019 100644 --- a/addons/web/static/src/js/core/rpc.js +++ b/addons/web/static/src/js/core/rpc.js @@ -51,9 +51,15 @@ return { } if (options.method === 'read_group') { - params.kwargs.domain = options.domain || params.domain || params.kwargs.domain || []; - params.kwargs.fields = options.fields || params.fields || params.kwargs.fields || []; - params.kwargs.groupby = options.groupBy || params.groupBy || params.kwargs.groupby || []; + if (!(params.args && params.args[0] !== undefined)) { + params.kwargs.domain = options.domain || params.domain || params.kwargs.domain || []; + } + if (!(params.args && params.args[1] !== undefined)) { + params.kwargs.fields = options.fields || params.fields || params.kwargs.fields || []; + } + if (!(params.args && params.args[2] !== undefined)) { + params.kwargs.groupby = options.groupBy || params.groupBy || params.kwargs.groupby || []; + } params.kwargs.offset = options.offset || params.offset || params.kwargs.offset; params.kwargs.limit = options.limit || params.limit || params.kwargs.limit; // In kwargs, we look for "orderby" rather than "orderBy" (note the absence of capital B), |
