Merge pull request #132 from mistercrunch/fix_legend

[nvd3] fixing the legend toggle bug
apache · Feb 10, 2016 · 07d52ed · 07d52ed
2 parents e759dfa + c7ecb33
commit 07d52ed
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/panoramix/forms.py b/panoramix/forms.py
@@ -17,7 +17,7 @@ class BetterBooleanField(BooleanField):
     """
     def __call__(self, **kwargs):
         html = super(BetterBooleanField, self).__call__(**kwargs)
-        html += u'<input type="hidden" name="show_brush" value="false">'
+        html += u'<input type="hidden" name="{}" value="false">'.format(self.name)
         return widgets.HTMLString(html)
 
 

diff --git a/panoramix/static/widgets/viz_nvd3.js b/panoramix/static/widgets/viz_nvd3.js
@@ -26,15 +26,13 @@ function viz_nvd3(slice) {
           chart.xAxis
             .showMaxMin(fd.x_axis_showminmax)
             .staggerLabels(true);
-          chart.showLegend(fd.show_legend);
         } else if (viz_type === 'bar') {
           chart = nv.models.multiBarChart()
               .showControls(true)
               .groupSpacing(0.1);
           chart.xAxis
             .showMaxMin(false)
             .staggerLabels(true);
-          chart.showLegend(fd.show_legend);
           chart.stacked(fd.bar_stacked);
 
         } else if (viz_type === 'dist_bar') {
@@ -46,11 +44,9 @@ function viz_nvd3(slice) {
           chart.xAxis
             .showMaxMin(false);
           chart.stacked(fd.bar_stacked);
-
         } else if (viz_type === 'pie') {
           chart = nv.models.pieChart()
           colorKey = 'x';
-          chart.showLegend(fd.show_legend);
           chart.valueFormat(f);
           if (fd.donut) {
             chart.donut(true);
@@ -70,7 +66,6 @@ function viz_nvd3(slice) {
           chart.xAxis
             .showMaxMin(false)
             .staggerLabels(true);
-          chart.showLegend(fd.show_legend);
 
         } else if (viz_type === 'bubble') {
           var row = function(col1, col2){
@@ -79,7 +74,6 @@ function viz_nvd3(slice) {
           chart = nv.models.scatterChart();
           chart.showDistX(true);
           chart.showDistY(true);
-          chart.showLegend(fd.show_legend);
           chart.tooltip.contentGenerator(function (obj) {
             p = obj.point;
             var s = "<table>"
@@ -99,7 +93,10 @@ function viz_nvd3(slice) {
           chart.xAxis
             .showMaxMin(false)
             .staggerLabels(true);
-          chart.showLegend(fd.show_legend);
+        }
+        if ("showLegend" in chart) {
+            if ('show_legend' in fd)
+              chart.showLegend(fd.show_legend);
         }
 
         var height = slice.height();

diff --git a/panoramix/utils.py b/panoramix/utils.py
@@ -202,8 +202,8 @@ def wrapper(*args, **kwargs):
         log = models.Log(
             action=f.__name__,
             json=json.dumps(d),
-            dashboard_id=d.get('dashboard_id'),
-            slice_id=d.get('slice_id'),
+            dashboard_id=d.get('dashboard_id') or None,
+            slice_id=d.get('slice_id') or None,
             user_id=user_id)
         db.session.add(log)
         db.session.commit()