summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/views/basic/basic_model.js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-08-24 22:12:20 +0200
committerChristophe Simonis <chs@odoo.com>2018-08-24 22:12:20 +0200
commit9f99eb9cb05833d21bcd775f482e7673956e00d1 (patch)
tree8e0971543cc5870cf90b8cdfebb157e7831ffb89 /addons/web/static/src/js/views/basic/basic_model.js
parent3a95d2fdf8a7751276b88e0208be5ba3e181b62c (diff)
parent3be46428ccfa7149df4dccf07c37a58e6dc96a21 (diff)
[MERGE] forward port branch saas-11.3 up to 3be46428ccf
Diffstat (limited to 'addons/web/static/src/js/views/basic/basic_model.js')
-rw-r--r--addons/web/static/src/js/views/basic/basic_model.js8
1 files changed, 7 insertions, 1 deletions
diff --git a/addons/web/static/src/js/views/basic/basic_model.js b/addons/web/static/src/js/views/basic/basic_model.js
index 4b4a4a86c16..32bab9373a9 100644
--- a/addons/web/static/src/js/views/basic/basic_model.js
+++ b/addons/web/static/src/js/views/basic/basic_model.js
@@ -905,8 +905,14 @@ var BasicModel = AbstractModel.extend({
params: params,
})
.then(function () {
+ var offset = options.offset ? options.offset : 0;
+ var old_data = data.data.slice();
data.data = _.sortBy(data.data, function (d) {
- return _.indexOf(resIDs, self.localData[d].res_id);
+ if (_.contains(resIDs, self.localData[d].res_id)) {
+ return _.indexOf(resIDs, self.localData[d].res_id) + offset;
+ } else {
+ return _.indexOf(old_data, d);
+ }
});
data.res_ids = [];
_.each(data.data, function (d) {