summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/framework
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-08-20 18:08:19 +0200
committerChristophe Simonis <chs@odoo.com>2016-08-20 18:08:19 +0200
commit235ed4b2c1099720a6d5cfc5ada920f19fcef315 (patch)
tree2ddc3ae85462fe3cc6e70f9598958797695d12ff /addons/web/static/src/js/framework
parentc3734ec5b622085a36e94bee36f92daabbae3e34 (diff)
parent9ad5f26b3fb98cd14527de80d19bf6554a6981e2 (diff)
[MERGE] forward port branch saas-12 up to 9ad5f26
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');