diff options
| author | Vandan Shah <vas@odoo.com> | 2018-05-11 07:01:55 +0000 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2019-02-19 11:01:40 +0000 |
| commit | d09ecc8b182f93a1fd6cd5a67b327a1ab3bc4f99 (patch) | |
| tree | 65d625e5e9d9631126dbb53735257b6818a40c4f /addons/web/static/src/js | |
| parent | f5c269db121323d6fcc6d58b0ef335ca3be24db1 (diff) | |
[IMP] web: improve kanban tooltip
1) Remove the total record tooltip from kanban group.
2) Remove progressbar help from kanban view.
3) Improvements in testcase since we have removed total record tooltip.
Diffstat (limited to 'addons/web/static/src/js')
| -rw-r--r-- | addons/web/static/src/js/views/kanban/kanban_column.js | 17 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/kanban/kanban_column_progressbar.js | 8 |
2 files changed, 8 insertions, 17 deletions
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] && "<div>" + help + "<br>" + data.tooltipData[field] + "</div>") || ''; - }).join(''); - } else { - this.tooltipInfo = ""; + this.tooltipInfo = _.compact(_.map(options.group_by_tooltip, function (help, field) { + help = help ? help + "</br>" : ''; + return (data.tooltipData && data.tooltipData[field] && "<div>" + help + data.tooltipData[field] + "</div>") || ''; + })); + this.tooltipInfo = this.tooltipInfo.join("<div class='dropdown-divider' role='separator' />"); } }, /** @@ -102,7 +102,6 @@ var KanbanColumn = Widget.extend({ defs.push(def); } } - this.$header.find('.o_kanban_header_title').tooltip(); if (!config.device.isMobile) { // deactivate sortable in mobile mode. It does not work anyway, @@ -162,9 +161,9 @@ var KanbanColumn = Widget.extend({ this.$header.find('.o_column_title').text(title); this.$el.toggleClass('o_column_folded', this.folded && !config.device.isMobile); - var tooltip = this.data.count + _t(' records'); - tooltip = '<p>' + tooltip + '</p>' + 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; |
