From 51024b5f8a7d5480ab18112cb28e460ed01620f1 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Thu, 23 Jun 2016 22:43:40 -0700
Subject: [PATCH] Reintroducing showControls as an option (#672)

---
 caravel/assets/package.json               | 2 +-
 caravel/assets/visualizations/nvd3_vis.js | 6 +++---
 caravel/forms.py                          | 8 ++++++++
 caravel/viz.py                            | 5 +++--
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/caravel/assets/package.json b/caravel/assets/package.json
index 07a41fa154708..efc3e64596337 100644
--- a/caravel/assets/package.json
+++ b/caravel/assets/package.json
@@ -61,7 +61,7 @@
     "less": "^2.6.1",
     "less-loader": "^2.2.2",
     "mustache": "^2.2.1",
-    "nvd3": "1.8.2",
+    "nvd3": "1.8.3",
     "react": "^0.14.7",
     "react-bootstrap": "^0.28.3",
     "react-dom": "^0.14.7",
diff --git a/caravel/assets/visualizations/nvd3_vis.js b/caravel/assets/visualizations/nvd3_vis.js
index 67bd6f7df9b20..928a1b4be4e73 100644
--- a/caravel/assets/visualizations/nvd3_vis.js
+++ b/caravel/assets/visualizations/nvd3_vis.js
@@ -64,7 +64,7 @@ function nvd3Vis(slice) {
 
           case 'bar':
             chart = nv.models.multiBarChart()
-            .showControls(false)
+            .showControls(fd.show_controls)
             .groupSpacing(0.1);
 
             if (!reduceXTicks) {
@@ -80,7 +80,7 @@ function nvd3Vis(slice) {
 
           case 'dist_bar':
             chart = nv.models.multiBarChart()
-            .showControls(false)
+            .showControls(fd.show_controls)
             .reduceXTicks(reduceXTicks)
             .rotateLabels(45)
             .groupSpacing(0.1); //Distance between each group of bars.
@@ -143,7 +143,7 @@ function nvd3Vis(slice) {
 
           case 'area':
             chart = nv.models.stackedAreaChart();
-            chart.showControls(false);
+            chart.showControls(fd.show_controls);
             chart.style(fd.stacked_style);
             chart.xScale(d3.time.scale.utc());
             chart.xAxis
diff --git a/caravel/forms.py b/caravel/forms.py
index 6f5d76b76b550..86f7fef148b4f 100644
--- a/caravel/forms.py
+++ b/caravel/forms.py
@@ -225,6 +225,14 @@ def __init__(self, viz):
                 "default": False,
                 "description": ""
             }),
+            'show_controls': (BetterBooleanField, {
+                "label": _("Extra Controls"),
+                "default": False,
+                "description": (
+                    "Whether to show extra controls or not. Extra controls "
+                    "include things like making mulitBar charts stacked "
+                    "or side by side.")
+            }),
             'reduce_x_ticks': (BetterBooleanField, {
                 "label": _("Reduce X ticks"),
                 "default": False,
diff --git a/caravel/viz.py b/caravel/viz.py
index c5353cb9d9e08..a5e327ec94e5a 100644
--- a/caravel/viz.py
+++ b/caravel/viz.py
@@ -1084,7 +1084,7 @@ class NVD3TimeSeriesBarViz(NVD3TimeSeriesViz):
             ('line_interpolation', 'bar_stacked'),
             ('x_axis_showminmax', 'bottom_margin'),
             ('x_axis_label', 'y_axis_label'),
-            ('reduce_x_ticks', None),
+            ('reduce_x_ticks', 'show_controls'),
         ), }] + [NVD3TimeSeriesViz.fieldsets[2]]
 
 
@@ -1110,7 +1110,7 @@ class NVD3TimeSeriesStackedViz(NVD3TimeSeriesViz):
             ('rich_tooltip', 'y_axis_zero'),
             ('y_log_scale', 'contribution'),
             ('x_axis_format', 'y_axis_format'),
-            ('x_axis_showminmax'),
+            ('x_axis_showminmax', 'show_controls'),
             ('line_interpolation', 'stacked_style'),
         ), }] + [NVD3TimeSeriesViz.fieldsets[2]]
 
@@ -1169,6 +1169,7 @@ class DistributionBarViz(DistributionPieViz):
             ('y_axis_format', 'bottom_margin'),
             ('x_axis_label', 'y_axis_label'),
             ('reduce_x_ticks', 'contribution'),
+            ('show_controls', None),
         )
     },)
     form_overrides = {