[MERGE] merge from trunk

bzr revid: ged@openerp.com-20140113081007-sw0hkl7ps5y2in9g
2014-01-13 09:10:07 +01:00
parent c0c686cd15 5881686194
commit d04c788f2e
1 changed files with 2 additions and 1 deletions
@@ -14,6 +14,7 @@ instance.web_kanban.SparklineBarWidget = instance.web_kanban.AbstractField.exten
            var value = _.pluck(self.field.value, 'value');
            var tooltips = _.pluck(self.field.value, 'tooltip');
            var suffix = self.options.tooltip_suffix || "";
+            var tooltipFormat = self.options.type == 'tristate' && '{{offset:offset}}' + suffix || '{{offset:offset}} {{value:value}}' + suffix
            var sparkline_options = _.extend({
                    type: 'bar',
                    barWidth: 5,
@@ -21,7 +22,7 @@ instance.web_kanban.SparklineBarWidget = instance.web_kanban.AbstractField.exten
                    barWidth: 4,
                    barSpacing: 1,
                    barColor: '#96d854',
-                    tooltipFormat: '{{offset:offset}} {{value}} ' + suffix,
+                    tooltipFormat: tooltipFormat,
                    chartRangeMin: 0,
                    tooltipValueLookups: {
                        'offset': tooltips