From fed0b52dd5b559f628dd94f0dee06a0c7f177b31 Mon Sep 17 00:00:00 2001 From: Mathieu Duckerts-Antoine Date: Tue, 26 May 2020 21:07:48 +0000 Subject: [PATCH] [IMP] board: adapt board to comparison menu The "board" module has been adapted accordingly to the recently introduced comparison menu. Task ID: 2245719 Co-authored-by: Mathieu Duckerts-Antoine Co-authored-by: Julien Mougenot --- addons/board/static/src/js/add_to_board_menu.js | 3 +-- addons/board/static/src/js/board_view.js | 9 ++------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/addons/board/static/src/js/add_to_board_menu.js b/addons/board/static/src/js/add_to_board_menu.js index dd5158c6d50..95e15e530c2 100644 --- a/addons/board/static/src/js/add_to_board_menu.js +++ b/addons/board/static/src/js/add_to_board_menu.js @@ -56,9 +56,8 @@ odoo.define('board.AddToBoardMenu', function (require) { orderedBy: searchQuery.orderedBy, }); if (searchQuery.timeRanges && searchQuery.timeRanges.hasOwnProperty('fieldName')) { - const { fieldName: field, range, comparisonRange } = searchQuery.timeRanges; context.add({ - time_ranges : { field, range, comparisonRange }, + comparison: searchQuery.timeRanges, }); } let controllerQueryParams; diff --git a/addons/board/static/src/js/board_view.js b/addons/board/static/src/js/board_view.js index b64de177133..4c4d6b92ae5 100644 --- a/addons/board/static/src/js/board_view.js +++ b/addons/board/static/src/js/board_view.js @@ -267,13 +267,8 @@ var BoardRenderer = FormRenderer.extend({ orderedBy: context.orderedBy || [], }; - if (['pivot', 'dashboard', 'graph', 'cohort'].includes(viewType)) { - if (context.time_ranges) { - const { field: fieldName, range, comparisonRange } = context.time_ranges; - searchQuery.timeRanges = { fieldName, range, comparisonRange }; - } else { - searchQuery.timeRanges = {}; - } + if (View.prototype.searchMenuTypes.includes('comparison')) { + searchQuery.timeRanges = context.comparison || {}; } var view = new View(viewInfo, {