From afa7160d0734ba46e6a91d59ee9a1fa453ea089c Mon Sep 17 00:00:00 2001 From: FrancoisGe Date: Wed, 21 Jun 2023 09:01:17 +0000 Subject: [PATCH] [FIX] web: o2m multi page sort on two column Part-of: odoo/odoo#114024 --- addons/web/static/src/model/relational_model/static_list.js | 2 +- .../web/static/tests/views/fields/one2many_field_tests.js | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/model/relational_model/static_list.js b/addons/web/static/src/model/relational_model/static_list.js index 46b7a9ec2da..5abb03d938a 100644 --- a/addons/web/static/src/model/relational_model/static_list.js +++ b/addons/web/static/src/model/relational_model/static_list.js @@ -860,7 +860,7 @@ export class StaticList extends DataPoint { const fieldNames = orderBy.map((o) => o.name); const resIds = this._getResIdsToLoad(currentIds, fieldNames); if (resIds.length) { - const activeFields = pick(this.activeFields, fieldNames); + const activeFields = pick(this.activeFields, ...fieldNames); const config = { ...this.config, resIds, activeFields }; const records = await this.model._loadRecords(config); for (const record of records) { diff --git a/addons/web/static/tests/views/fields/one2many_field_tests.js b/addons/web/static/tests/views/fields/one2many_field_tests.js index 66738b0fbb2..e26d1747957 100644 --- a/addons/web/static/tests/views/fields/one2many_field_tests.js +++ b/addons/web/static/tests/views/fields/one2many_field_tests.js @@ -2971,6 +2971,12 @@ QUnit.module("Fields", (hooks) => { ["abc1", "xyz1"] ); + await click(target.querySelector("table thead [data-name='int_field'].o_column_sortable")); + assert.deepEqual( + [...target.querySelectorAll(".o_data_row")].map((c) => c.textContent), + ["abc1", "xyz1"] + ); + await click(target.querySelector("table thead [data-name='foo'].o_column_sortable")); assert.deepEqual( [...target.querySelectorAll(".o_data_row")].map((c) => c.textContent),