summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/core/rpc.js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-04-16 19:50:50 +0200
committerChristophe Simonis <chs@odoo.com>2018-04-16 19:50:50 +0200
commit74033eb007749c88b84ea883b006a5877355306e (patch)
tree8f8b6cb22cc2bf6046ba04e388ea29855a33c597 /addons/web/static/src/js/core/rpc.js
parent71cdefd9f41881d9720433d5fc7732759098f9a4 (diff)
parent90f8f17fb4fc795c2c12d68d21900e81f3d7a223 (diff)
[MERGE] forward port branch saas-11.2 up to 90f8f17fb4f
Diffstat (limited to 'addons/web/static/src/js/core/rpc.js')
-rw-r--r--addons/web/static/src/js/core/rpc.js14
1 files changed, 7 insertions, 7 deletions
diff --git a/addons/web/static/src/js/core/rpc.js b/addons/web/static/src/js/core/rpc.js
index 53d298c9019..cc56cb74ebb 100644
--- a/addons/web/static/src/js/core/rpc.js
+++ b/addons/web/static/src/js/core/rpc.js
@@ -52,19 +52,19 @@ return {
if (options.method === 'read_group') {
if (!(params.args && params.args[0] !== undefined)) {
- params.kwargs.domain = options.domain || params.domain || params.kwargs.domain || [];
+ 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 || [];
+ 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.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;
+ 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),
// since the Python argument to the actual function is "orderby".
- var orderBy = options.orderBy || params.orderBy || params.kwargs.orderby;
+ var orderBy = options.orderBy || params.orderBy || params.kwargs.orderby;
params.kwargs.orderby = orderBy ? this._serializeSort(orderBy) : orderBy;
params.kwargs.lazy = 'lazy' in options ? options.lazy : params.lazy;
}
@@ -72,7 +72,7 @@ return {
if (options.method === 'search_read') {
// call the model method
params.kwargs.domain = options.domain || params.domain || params.kwargs.domain;
- params.kwargs.fields = options.fields || params.fields || params.kwargs.fields;
+ params.kwargs.fields = options.fields || params.fields || params.kwargs.fields;
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 "order" rather than "orderBy" since the Python