From cffedb2ee9a26eb820293f76df1fcd86f2fdace7 Mon Sep 17 00:00:00 2001 From: Dossogne Bertrand Date: Thu, 18 Aug 2022 12:26:47 +0000 Subject: [PATCH] [IMP] hr_contract: hr_contract_history_list to owl taskID 2957257 closes odoo/odoo#98397 Signed-off-by: Kevin Baptiste --- addons/hr_contract/__manifest__.py | 1 + .../js/hr_contract_history_list_controller.js | 23 ++++++++++--------- .../src/js/hr_contract_history_views.js | 15 ++++++------ 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/addons/hr_contract/__manifest__.py b/addons/hr_contract/__manifest__.py index ed75cd3afab..f497354bfdd 100644 --- a/addons/hr_contract/__manifest__.py +++ b/addons/hr_contract/__manifest__.py @@ -36,6 +36,7 @@ You can assign several contracts per employee. 'assets': { 'web.assets_backend': [ 'hr_contract/static/src/scss/*', + 'hr_contract/static/src/js/*', ], 'web.assets_qweb': [ 'hr_contract/static/src/xml/*', diff --git a/addons/hr_contract/static/src/js/hr_contract_history_list_controller.js b/addons/hr_contract/static/src/js/hr_contract_history_list_controller.js index b333a2f8746..8a33bdf9908 100644 --- a/addons/hr_contract/static/src/js/hr_contract_history_list_controller.js +++ b/addons/hr_contract/static/src/js/hr_contract_history_list_controller.js @@ -1,23 +1,24 @@ /** @odoo-module **/ -import ListController from "web.ListController"; -import { _lt } from 'web.core'; +import { useService } from "@web/core/utils/hooks"; +import { ListController } from "@web/views/list/list_controller"; -export const HrContractHistoryListController = ListController.extend({ +export class HrContractHistoryListController extends ListController { + setup() { + super.setup(); + this.actionService = useService('action'); + } /** * @override */ - _onCreateRecord(ev) { - if (ev) { - ev.stopPropagation(); - } - this.do_action({ - name: _lt('New Employee'), + async createRecord({ group } = {}) { + this.actionService.doAction({ + name: this.env._t('New Employee'), type: 'ir.actions.act_window', res_model: 'hr.employee', views: [[false, 'form']], view_mode: 'form', }); - }, -}); + } +} diff --git a/addons/hr_contract/static/src/js/hr_contract_history_views.js b/addons/hr_contract/static/src/js/hr_contract_history_views.js index 60b219da793..0a1a58e2b96 100644 --- a/addons/hr_contract/static/src/js/hr_contract_history_views.js +++ b/addons/hr_contract/static/src/js/hr_contract_history_views.js @@ -1,13 +1,12 @@ /** @odoo-module **/ -import ListView from "web.ListView"; -import viewRegistry from 'web.view_registry'; +import { registry } from "@web/core/registry"; +import { listView } from "@web/views/list/list_view"; import { HrContractHistoryListController } from "./hr_contract_history_list_controller"; -export const HrContractHistoryView = ListView.extend({ - config: _.extend({}, ListView.prototype.config, { - Controller: HrContractHistoryListController, - }), -}); +export const HrContractHistoryView = { + ...listView, + Controller: HrContractHistoryListController, +} -viewRegistry.add('hr_contract_history_list', HrContractHistoryView); +registry.category("views").add('hr_contract_history_list', HrContractHistoryView);