From 1b4767ee798562911922a7e03b04b4e6485350be Mon Sep 17 00:00:00 2001 From: Kevin Baptiste Date: Tue, 21 Apr 2020 06:31:47 +0000 Subject: [PATCH] [IMP] hr_holidays: hide duplicated info on popover The name of the employee and the dates were shown multiple times in the popover. This commit aims at showing the relevant information only once. closes odoo/odoo#49845 Taskid: 2227158 Signed-off-by: Yannick Tivisse (yti) --- addons/hr_holidays/report/hr_leave_report_calendar.xml | 2 +- addons/hr_holidays/static/src/js/time_off_calendar.js | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/addons/hr_holidays/report/hr_leave_report_calendar.xml b/addons/hr_holidays/report/hr_leave_report_calendar.xml index 459fe8810ec..0d90bf533bf 100644 --- a/addons/hr_holidays/report/hr_leave_report_calendar.xml +++ b/addons/hr_holidays/report/hr_leave_report_calendar.xml @@ -16,7 +16,7 @@ hr.leave.report.calendar.view hr.leave.report.calendar - + diff --git a/addons/hr_holidays/static/src/js/time_off_calendar.js b/addons/hr_holidays/static/src/js/time_off_calendar.js index b012aff2e1c..dd5c94f01dd 100644 --- a/addons/hr_holidays/static/src/js/time_off_calendar.js +++ b/addons/hr_holidays/static/src/js/time_off_calendar.js @@ -19,8 +19,14 @@ odoo.define('hr_holidays.dashboard.view_custo', function(require) { const state = this.event.extendedProps.record.state; this.canDelete = state && ['validate', 'refuse'].indexOf(state) === -1; this.canEdit = state !== undefined; - this.display_name = this.event.extendedProps.record.display_name; this.displayFields = []; + + if (this.modelName === "hr.leave.report.calendar") { + const duration = this.event.extendedProps.record.display_name.split(':').slice(-1); + this.display_name = _.str.sprintf(_t("Time Off : %s"), duration); + } else { + this.display_name = this.event.extendedProps.record.display_name; + } }, });