diff --git a/addons/web/static/src/js/views/kanban/kanban_column.js b/addons/web/static/src/js/views/kanban/kanban_column.js index b526b80a971..2828ca491ca 100644 --- a/addons/web/static/src/js/views/kanban/kanban_column.js +++ b/addons/web/static/src/js/views/kanban/kanban_column.js @@ -81,11 +81,11 @@ var KanbanColumn = Widget.extend({ } if (options.group_by_tooltip) { - this.tooltipInfo = _.map(options.group_by_tooltip, function (help, field) { - return (data.tooltipData && data.tooltipData[field] && "
' + tooltip + '
' + this.tooltipInfo; - this.$header.find('.o_kanban_header_title').tooltip({}).attr('data-original-title', tooltip); + if (this.tooltipInfo) { + this.$header.find('.o_kanban_header_title').tooltip({}).attr('data-original-title', this.tooltipInfo); + } if (!this.remaining) { this.$('.o_kanban_load_more').remove(); } else { diff --git a/addons/web/static/src/js/views/kanban/kanban_column_progressbar.js b/addons/web/static/src/js/views/kanban/kanban_column_progressbar.js index 59f09bc9bb6..0c484931aae 100644 --- a/addons/web/static/src/js/views/kanban/kanban_column_progressbar.js +++ b/addons/web/static/src/js/views/kanban/kanban_column_progressbar.js @@ -30,7 +30,6 @@ var KanbanColumnProgressBar = Widget.extend({ this.fieldName = columnState.progressBarValues.field; this.colors = columnState.progressBarValues.colors; this.sumField = columnState.progressBarValues.sum_field; - this.progressBarHelp = columnState.progressBarValues.help; // Previous progressBar state var state = options.progressBarStates[this.columnID]; @@ -131,13 +130,6 @@ var KanbanColumnProgressBar = Widget.extend({ } }, }); - if (this.progressBarHelp && _.every(this.subgroupCounts, function (val) { return val === 0; })) { - this.$el.tooltip({ - delay: 0, - trigger: 'hover', - title: this.progressBarHelp, - }); - } // Display and animate the progress bars var barNumber = 0; diff --git a/addons/web/static/src/xml/kanban.xml b/addons/web/static/src/xml/kanban.xml index 8a9ac5fdb7d..0908d052980 100644 --- a/addons/web/static/src/xml/kanban.xml +++ b/addons/web/static/src/xml/kanban.xml @@ -12,7 +12,7 @@1 records
", - "first column should have a tooltip with the number of records, but not" + - "the group_by_tooltip title and the many2one field value since it has no value"); + assert.ok(!kanban.$('.o_kanban_group:first .o_kanban_header_title').data('original-title'), + "tooltip of first column should not defined, since group_by_tooltip title and the many2one field has no value"); assert.ok(kanban.$('.o_kanban_group:eq(1) span.o_column_title:contains(hello)').length, "second column should have a title with a value from the many2one"); assert.strictEqual(kanban.$('.o_kanban_group:eq(1) .o_kanban_header_title').data('original-title'), - "2 records