From 066b3339ff1dccf2c6ffbe5fabefd2b94add004e Mon Sep 17 00:00:00 2001 From: Samuel Degueldre Date: Tue, 25 May 2021 12:25:49 +0200 Subject: [PATCH] [FIX] board: replace include on ActionManager with override on view --- addons/board/__manifest__.py | 1 - .../src/js/action_manager_board_action.js | 33 ------------------- addons/board/static/src/js/board_view.js | 13 ++++++++ addons/board/static/tests/dashboard_tests.js | 2 +- 4 files changed, 14 insertions(+), 35 deletions(-) delete mode 100644 addons/board/static/src/js/action_manager_board_action.js diff --git a/addons/board/__manifest__.py b/addons/board/__manifest__.py index b504003488d06..a9cf9adb4861d 100644 --- a/addons/board/__manifest__.py +++ b/addons/board/__manifest__.py @@ -22,7 +22,6 @@ 'assets': { 'web.assets_backend': [ 'board/static/src/scss/dashboard.scss', - 'board/static/src/js/action_manager_board_action.js', 'board/static/src/js/board_view.js', 'board/static/src/js/add_to_board_menu.js', ], diff --git a/addons/board/static/src/js/action_manager_board_action.js b/addons/board/static/src/js/action_manager_board_action.js deleted file mode 100644 index 31185abfeb9d3..0000000000000 --- a/addons/board/static/src/js/action_manager_board_action.js +++ /dev/null @@ -1,33 +0,0 @@ -// odoo.define('board.ActionManager', function (require) { -// "use strict"; - -// /** -// * The purpose of this file is to patch the ActionManager to properly generate -// * the flags for the 'ir.actions.act_window' of model 'board.board'. -// */ - -// var ActionManager = require('web.ActionManager'); - -// ActionManager.include({ -// //-------------------------------------------------------------------------- -// // Private -// //-------------------------------------------------------------------------- - -// /** -// * @override -// * @private -// */ -// _executeWindowAction: function (action) { -// if (action.res_model === 'board.board' && action.view_mode === 'form') { -// action.target = 'inline'; -// _.extend(action.flags, { -// hasActionMenus: false, -// hasSearchView: false, -// headless: true, -// }); -// } -// return this._super.apply(this, arguments); -// }, -// }); - -// }); diff --git a/addons/board/static/src/js/board_view.js b/addons/board/static/src/js/board_view.js index 87b5034f04d63..d0cb35da9274e 100644 --- a/addons/board/static/src/js/board_view.js +++ b/addons/board/static/src/js/board_view.js @@ -446,6 +446,19 @@ var BoardView = FormView.extend({ this._super.apply(this, arguments); this.controllerParams.customViewID = viewInfo.custom_view_id; }, + /** + * @override + */ + _extractParamsFromAction(action) { + action.target = "inline"; + action.flags = action.flags || {}; + Object.assign(action.flags, { + hasActionMenus: false, + hasSearchView: false, + headless: true, + }); + return this._super.apply(this, arguments); + }, }); return BoardView; diff --git a/addons/board/static/tests/dashboard_tests.js b/addons/board/static/tests/dashboard_tests.js index 48b435a0a71f4..86e203c7d9bf8 100644 --- a/addons/board/static/tests/dashboard_tests.js +++ b/addons/board/static/tests/dashboard_tests.js @@ -82,7 +82,7 @@ QUnit.test('dashboard basic rendering', async function (assert) { "with a dashboard, the renderer should have the proper css class"); assert.containsOnce(form, '.o_dashboard .o_view_nocontent', "should have a no content helper"); - assert.strictEqual(form.$('.o_control_panel .breadcrumb-item').text(), "My Dashboard", + assert.strictEqual(form.getTitle(), "My Dashboard", "should have the correct title"); form.destroy(); });