summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/views/basic/basic_model.js
diff options
context:
space:
mode:
authorkujiu <kujiu@users.noreply.github.com>2017-10-04 10:45:54 +0200
committerGitHub <noreply@github.com>2017-10-04 10:45:54 +0200
commit2f07bbca8c45a593046a370353dc694de50b784a (patch)
tree0b71912b11b57f9cd0bd71a0bb68e1c920dd40f1 /addons/web/static/src/js/views/basic/basic_model.js
parent9e7a33f7df7a801858013519fb9c770a1980b917 (diff)
[FIX] web: Ordering of inline tree views (#19856)
Allow to order from several columns in inline tree views (x2many fields in form views).
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.js15
1 files changed, 11 insertions, 4 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 57c4a1f3743..294d7ce077b 100644
--- a/addons/web/static/src/js/views/basic/basic_model.js
+++ b/addons/web/static/src/js/views/basic/basic_model.js
@@ -3666,10 +3666,16 @@ var BasicModel = AbstractModel.extend({
var self = this;
// sort records according to ordered_by[0]
- var order = list.orderedBy[0];
var data = list.data;
var res_ids = list.res_ids;
- data.sort(function (record1ID, record2ID) {
+ var compareRecords = function (record1ID, record2ID, level) {
+ if(!level) {
+ level = 0;
+ }
+ if(list.orderedBy.length < level + 1) {
+ return 0;
+ }
+ var order = list.orderedBy[level];
var r1 = self.localData[record1ID];
var r2 = self.localData[record2ID];
var data1 = _.extend({}, r1.data, r1._changes);
@@ -3680,8 +3686,9 @@ var BasicModel = AbstractModel.extend({
if (data1[order.name] > data2[order.name]) {
return order.asc ? 1 : -1;
}
- return 0;
- });
+ return compareRecords(record1ID, record2ID, level + 1);
+ };
+ data.sort(compareRecords);
// sort res_ids accordingly (only the current range of ids, the one
// mapping the data, needs to be sorted)