diff options
| author | Kaushalya Mandaliya <kma@odoo.com> | 2020-02-13 14:06:41 +0000 |
|---|---|---|
| committer | Kaushalya Mandaliya <kma@odoo.com> | 2020-03-04 09:50:58 +0000 |
| commit | e1b257bd8aa3f54f0f1a4612b291bb80301d611e (patch) | |
| tree | d59096fc81cdb4fd107b28c79cda029ed360035d /addons/web/static/src/js/views/calendar | |
| parent | d47f039fd24d062001c77171db0f1da0447e0a97 (diff) | |
[IMP] web: prevent tooltip duplication on a responsible in the calendar
Before this commit,
Hovering on a responsible on the right column of the calendar will:
- show a classic yellow tooltip
- show a custom tooltip with a bigger image
After this commit,
Hovering on a responsible on the right column of the calendar will:
- show a custom tooltip with a bigger image if image exist
else, show classic tooltip
PR odoo/odoo#45353
Task-2194828
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
Diffstat (limited to 'addons/web/static/src/js/views/calendar')
| -rw-r--r-- | addons/web/static/src/js/views/calendar/calendar_renderer.js | 10 |
1 files changed, 5 insertions, 5 deletions
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 471ccfbb0c3..7f281e474c9 100644 --- a/addons/web/static/src/js/views/calendar/calendar_renderer.js +++ b/addons/web/static/src/js/views/calendar/calendar_renderer.js @@ -639,14 +639,14 @@ return AbstractRenderer.extend({ var self = this; options.getColor = this.getColor.bind(this); options.fields = this.state.fields; - var filter = new SidebarFilter(self, options); - prom = filter.appendTo(this.$sidebar).then(function () { + var sidebarFilter = new SidebarFilter(self, options); + prom = sidebarFilter.appendTo(this.$sidebar).then(function () { // Show filter popover if (options.avatar_field) { _.each(options.filters, function (filter) { - if (filter.value !== 'all') { + if (!['all', false].includes(filter.value)) { var selector = _.str.sprintf('.o_calendar_filter_item[data-value=%s]', filter.value); - self.$sidebar.find(selector).popover({ + sidebarFilter.$el.find(selector).popover({ animation: false, trigger: 'hover', html: true, @@ -665,7 +665,7 @@ return AbstractRenderer.extend({ } return self._renderFiltersOneByOne(filterIndex + 1); }); - this.filters.push(filter); + this.filters.push(sidebarFilter); } return Promise.resolve(prom); }, |
