diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index fa76e6c4877..888073214d3 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -156,7 +156,6 @@ diff --git a/addons/web_kanban/static/src/js/kanban_record.js b/addons/web_kanban/static/src/js/kanban_record.js index 473ebc59e98..c784073f2a5 100644 --- a/addons/web_kanban/static/src/js/kanban_record.js +++ b/addons/web_kanban/static/src/js/kanban_record.js @@ -64,6 +64,7 @@ var KanbanRecord = Widget.extend({ qweb_context[p] = _.bind(this[p], this); } } + this.qweb_context = qweb_context; this.content = this.qweb.render('kanban-box', qweb_context); }, @@ -81,7 +82,18 @@ var KanbanRecord = Widget.extend({ }, start: function() { + var self = this; this.add_widgets(); + this.$('[tooltip]').each(function () { + var $el = $(this); + var tooltip = $el.attr('tooltip'); + if (tooltip) { + $el.tooltip({ + 'html': true, + 'title': self.qweb.render(tooltip, self.qweb_context) + }); + } + }); }, renderElement: function () { @@ -172,14 +184,15 @@ var KanbanRecord = Widget.extend({ if (elem == ev.currentTarget) { ischild = false; } + var test_event = events && events.click && (events.click.length > 1 || events.click[0].namespace !== "tooltip"); if (ischild) { children.push(elem); - if (events && events.click) { + if (test_event) { // do not trigger global click if one child has a click event registered trigger = false; } } - if (trigger && events && events.click) { + if (trigger && test_event) { _.each(events.click, function(click_event) { if (click_event.selector) { // For each parent of original target, check if a