From 942c59bca4118e55df34743299f758fa3199f6fb Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Wed, 24 Aug 2016 17:20:02 -0400
Subject: [PATCH] Fix data labels

---
 .../charts/static/charts/nvd3/common/config.js    |  6 ------
 .../charts/static/charts/nvd3/pie/config.js       |  6 +++---
 .../static/charts/utilities/tabular-form.js       | 15 ++++++++-------
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/config/plugins/visualizations/charts/static/charts/nvd3/common/config.js b/config/plugins/visualizations/charts/static/charts/nvd3/common/config.js
index b51c916933b..3ba8e0701d9 100644
--- a/config/plugins/visualizations/charts/static/charts/nvd3/common/config.js
+++ b/config/plugins/visualizations/charts/static/charts/nvd3/common/config.js
@@ -6,12 +6,6 @@ define( [ 'plugin/charts/utilities/tabular-form', 'plugin/plugins/nvd3/nv.d3' ],
         tag         : 'svg',
         keywords    : 'nvd3 default',
         groups      : {
-            key: {
-                label       : 'Provide a label',
-                type        : 'text',
-                placeholder : 'Data label',
-                value       : 'Data label'
-            },
             color: {
                 label       : 'Pick a series color',
                 type        : 'color'
diff --git a/config/plugins/visualizations/charts/static/charts/nvd3/pie/config.js b/config/plugins/visualizations/charts/static/charts/nvd3/pie/config.js
index ed8457111db..189d021a863 100644
--- a/config/plugins/visualizations/charts/static/charts/nvd3/pie/config.js
+++ b/config/plugins/visualizations/charts/static/charts/nvd3/pie/config.js
@@ -1,5 +1,5 @@
-define( [ 'plugin/charts/nvd3/common/config' ], function( nvd3_config ) {
-    return $.extend( true, {}, {
+define( [ 'plugin/charts/utilities/tabular-form' ], function( default_config ) {
+    return $.extend( true, default_config, {
         title       : 'Pie chart',
         category    : 'Area charts',
         library     : 'NVD3',
@@ -7,7 +7,7 @@ define( [ 'plugin/charts/nvd3/common/config' ], function( nvd3_config ) {
         keywords    : 'nvd3 default',
         datatype    : 'tabular',
         groups      : {
-            x : {
+            label : {
                 label       : 'Labels',
                 type        : 'data_column',
                 is_label    : true,
diff --git a/config/plugins/visualizations/charts/static/charts/utilities/tabular-form.js b/config/plugins/visualizations/charts/static/charts/utilities/tabular-form.js
index f5b7fde8ad0..b7c22827d57 100644
--- a/config/plugins/visualizations/charts/static/charts/utilities/tabular-form.js
+++ b/config/plugins/visualizations/charts/static/charts/utilities/tabular-form.js
@@ -14,12 +14,13 @@ define( [ 'plugin/charts/utilities/tabular-inputs' ], function( Inputs ) {
             show_legend  : Inputs.boolean( 'show_legend', { label: 'Show legend', help: 'Would you like to add a legend?' } ),
             use_panels   : Inputs.boolean( 'use_panels', { label: 'Use multi-panels', help: 'Would you like to separate your data into individual panels?' } )
         },
-        series      : [{
-            name        : 'key',
-            label       : 'Provide a label',
-            type        : 'text',
-            placeholder : 'Data label',
-            value       : 'Data label'
-        }]
+        groups      : {
+            key: {
+                label       : 'Provide a label',
+                type        : 'text',
+                placeholder : 'Data label',
+                value       : 'Data label'
+            }
+        }
     }
 });
\ No newline at end of file