From 3e29babc3ecb1d160039e3786734acd8e6baa130 Mon Sep 17 00:00:00 2001 From: Romeo Fragomeli Date: Fri, 22 May 2020 15:34:56 +0000 Subject: [PATCH] [FIX] web: calendar: hide event span when not used MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Due to commit odoo/odoo@8e48ba3eb59939cb5f8bdb715afa5e520b532a00 a span was added to show the time before the title on a event in month view. DOM of event +---------------+ | SPAN FOR TIME | +---------------+ | TITLE | | | | | +---------------+ This commit, hide the empty span when is not needed, to avoid empty blank space. Steps to reproduce: * Go in calendar app * Go in view week (BUG) closes odoo/odoo#51859 X-original-commit: 8456be44b1bc6746563cbca5366257a1da8b4a53 Signed-off-by: Adrien Dieudonné (adr) Signed-off-by: rfr-odoo --- addons/web/static/src/js/views/calendar/calendar_renderer.js | 1 + addons/web/static/src/xml/web_calendar.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/views/calendar/calendar_renderer.js b/addons/web/static/src/js/views/calendar/calendar_renderer.js index 4f492585ef1..be96cf25068 100644 --- a/addons/web/static/src/js/views/calendar/calendar_renderer.js +++ b/addons/web/static/src/js/views/calendar/calendar_renderer.js @@ -354,6 +354,7 @@ return AbstractRenderer.extend({ event: event, record: event.extendedProps.record, color: this.getColor(event.extendedProps.color_index), + showTime: !self.hideTime && event.extendedProps.showTime, }; this.qweb_context = qweb_context; if (_.isEmpty(qweb_context.record)) { diff --git a/addons/web/static/src/xml/web_calendar.xml b/addons/web/static/src/xml/web_calendar.xml index 17b08464e6b..dbe7bb2834d 100644 --- a/addons/web/static/src/xml/web_calendar.xml +++ b/addons/web/static/src/xml/web_calendar.xml @@ -13,7 +13,7 @@
- +