[incubator-superset] branch master updated: [bubble] Fixing ad-hoc metric labels (#5630)

[jo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

johnbodley pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git


The following commit(s) were added to refs/heads/master by this push:
     new 46f89f4  [bubble] Fixing ad-hoc metric labels (#5630)
46f89f4 is described below

commit 46f89f45169a49c9a03a697bb25816af469c1c82
Author: John Bodley <45...@users.noreply.github.com>
AuthorDate: Tue Aug 14 17:11:40 2018 -0700

    [bubble] Fixing ad-hoc metric labels (#5630)
---
 superset/assets/src/visualizations/nvd3_vis.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/superset/assets/src/visualizations/nvd3_vis.js b/superset/assets/src/visualizations/nvd3_vis.js
index 33694dd..efa8064 100644
--- a/superset/assets/src/visualizations/nvd3_vis.js
+++ b/superset/assets/src/visualizations/nvd3_vis.js
@@ -331,9 +331,9 @@ export default function nvd3Vis(slice, payload) {
             `<tr><td style="color: ${p.color};">` +
               `<strong>${p[fd.entity]}</strong> (${p.group})` +
             '</td></tr>');
-          s += row(fd.x, xAxisFormatter(p.x));
-          s += row(fd.y, yAxisFormatter(p.y));
-          s += row(fd.size, formatter(p.size));
+          s += row(fd.x.label || fd.x, xAxisFormatter(p.x));
+          s += row(fd.y.label || fd.y, yAxisFormatter(p.y));
+          s += row(fd.size.label || fd.size, formatter(p.size));
           s += '</table>';
           return s;
         });