diff options
| author | RomainLibert <rli@odoo.com> | 2019-09-09 10:20:58 +0000 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2019-09-11 09:27:41 +0000 |
| commit | 653cccfd60f1ecafaf69ca6c266a3a0b0b541303 (patch) | |
| tree | 9fa681f0128f04e8d2760c4960a6bf06d8f6f923 /addons/web/static/src/js | |
| parent | ca06a0e6b3b9b1cc706b81f94c2bb73e8b1b782d (diff) | |
[FIX] web: Display event name on calendar popup instead of undefined
Purpose
=======
When you edit a Time Off Request from the dashboard. The title in the header
is undefined
https://drive.google.com/open?id=1vBg9AlVCN7rc5D6DUel8hx2uY-oOfwRs
Diffstat (limited to 'addons/web/static/src/js')
| -rw-r--r-- | addons/web/static/src/js/views/calendar/calendar_popover.js | 5 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/calendar/calendar_renderer.js | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/addons/web/static/src/js/views/calendar/calendar_popover.js b/addons/web/static/src/js/views/calendar/calendar_popover.js index 8c34ed87ba5..e6e5518d752 100644 --- a/addons/web/static/src/js/views/calendar/calendar_popover.js +++ b/addons/web/static/src/js/views/calendar/calendar_popover.js @@ -123,7 +123,10 @@ var CalendarPopover = Widget.extend(StandaloneFieldManagerMixin, { */ _onClickPopoverEdit: function (ev) { ev.preventDefault(); - this.trigger_up('edit_event', {id: this.event.id}); + this.trigger_up('edit_event', { + id: this.event.id, + title: this.event.record.display_name, + }); }, /** * @private 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 a8e12094e97..757835e694d 100644 --- a/addons/web/static/src/js/views/calendar/calendar_renderer.js +++ b/addons/web/static/src/js/views/calendar/calendar_renderer.js @@ -699,7 +699,7 @@ return AbstractRenderer.extend({ } else { context.eventDate.date = isSameDayEvent ? start.clone().format('dddd, LL') : start.clone().format('LL') + ' - ' + end.clone().format('LL'); } - + if (eventData.record.allday && isSameDayEvent) { context.eventDate.duration = _t("All day"); } else if (eventData.record.allday && !isSameDayEvent) { @@ -772,7 +772,10 @@ return AbstractRenderer.extend({ */ _onEditEvent: function (event) { this._unselectEvent(); - this.trigger_up('openEvent', {_id: event.data.id}); + this.trigger_up('openEvent', { + _id: event.data.id, + title: event.data.title, + }); }, /** * @private |
