summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/framework
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-08-20 17:18:31 +0200
committerChristophe Simonis <chs@odoo.com>2016-08-20 17:18:31 +0200
commit9ad5f26b3fb98cd14527de80d19bf6554a6981e2 (patch)
tree771dc0267ad045abb1f2c4c77e814fbf7f3923d9 /addons/web/static/src/js/framework
parentc3665fb5c9c9c50e9a8fd2d52e83c50f52d603aa (diff)
parent3a2147d95c8005ab7c1dbe4d94315e404ea5e5f9 (diff)
[MERGE] forward port branch saas-11 up to 3a2147d
Diffstat (limited to 'addons/web/static/src/js/framework')
-rw-r--r--addons/web/static/src/js/framework/data.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/static/src/js/framework/data.js b/addons/web/static/src/js/framework/data.js
index 92c85de3c16..78bc5f39bfd 100644
--- a/addons/web/static/src/js/framework/data.js
+++ b/addons/web/static/src/js/framework/data.js
@@ -688,7 +688,7 @@ var DataSetSearch = DataSet.extend({
.limit(options.limit || false);
q = q.order_by.apply(q, this._sort);
- return q.all().done(function (records) {
+ return this.orderer.add(q.all()).done(function (records) {
// FIXME: not sure about that one, *could* have discarded count
q.count().done(function (count) { self._length = count; });
self.ids = _(records).pluck('id');