diff options
Diffstat (limited to 'addons/web/static/src/js/core/rpc.js')
| -rw-r--r-- | addons/web/static/src/js/core/rpc.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/addons/web/static/src/js/core/rpc.js b/addons/web/static/src/js/core/rpc.js index 21ec43e3d95..802f7082cad 100644 --- a/addons/web/static/src/js/core/rpc.js +++ b/addons/web/static/src/js/core/rpc.js @@ -37,6 +37,7 @@ return { buildQuery: function (options) { var route; var params = options.params || {}; + var orderBy; if (options.route) { route = options.route; } else if (options.model && options.method) { @@ -50,7 +51,7 @@ return { params.kwargs.context = options.context || params.context || params.kwargs.context; } - if (options.method === 'read_group') { + if (options.method === 'read_group' || options.method === 'web_read_group') { if (!(params.args && params.args[0] !== undefined)) { params.kwargs.domain = options.domain || params.domain || params.kwargs.domain || []; } @@ -64,7 +65,7 @@ return { 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; + 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; } @@ -77,7 +78,7 @@ return { params.kwargs.limit = options.limit || params.limit || params.kwargs.limit; // In kwargs, we look for "order" rather than "orderBy" since the Python // argument to the actual function is "order". - var orderBy = options.orderBy || params.orderBy || params.kwargs.order; + orderBy = options.orderBy || params.orderBy || params.kwargs.order; params.kwargs.order = orderBy ? this._serializeSort(orderBy) : orderBy; } @@ -88,7 +89,7 @@ return { params.fields = options.fields || params.fields; params.limit = options.limit || params.limit; params.offset = options.offset || params.offset; - var orderBy = options.orderBy || params.orderBy; + orderBy = options.orderBy || params.orderBy; params.sort = orderBy ? this._serializeSort(orderBy) : orderBy; params.context = options.context || params.context || {}; } |
