From be6b8ad801a9b1e3576eeed9c6efb14a531414ef Mon Sep 17 00:00:00 2001
From: Alison <github@bankofknowledge.net>
Date: Fri, 1 Sep 2017 13:57:43 -0500
Subject: [PATCH 1/2] fix color list

---
 client/app/visualizations/chart/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/app/visualizations/chart/index.js b/client/app/visualizations/chart/index.js
index 6ac70e2416..9cd7ba7aff 100644
--- a/client/app/visualizations/chart/index.js
+++ b/client/app/visualizations/chart/index.js
@@ -123,8 +123,9 @@ function ChartEditor(ColorPalette, clientConfig) {
         if (scope.options.globalSeriesType === 'pie') {
           const seriesData = scope.queryResult.getData();
           scope.form.colorsList = [];
+          const xColumnName = scope.form.xAxisColumn;
           seriesData.forEach((rowOfData) => {
-            scope.form.colorsList.push(rowOfData.action);
+            scope.form.colorsList.push(rowOfData[xColumnName]);
           });
 
           const colorNames = scope.form.colorsList;

From 9232134cf3af30586efe5636720eff6a79f6a244 Mon Sep 17 00:00:00 2001
From: Alison <github@bankofknowledge.net>
Date: Fri, 1 Sep 2017 13:58:05 -0500
Subject: [PATCH 2/2] show series name but not a textbox in pie colors list

---
 client/app/visualizations/chart/chart-editor.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/app/visualizations/chart/chart-editor.html b/client/app/visualizations/chart/chart-editor.html
index 746a21ad74..4798d39012 100644
--- a/client/app/visualizations/chart/chart-editor.html
+++ b/client/app/visualizations/chart/chart-editor.html
@@ -285,8 +285,7 @@ <h4>{{$index == 0 ? 'Left' : 'Right'}} Y Axis</h4>
             ng-bind="options.seriesOptions[name].zIndex + 1"></span>
           </td>
           <td style="padding: 3px; width: 300px;">
-            <input placeholder="{{name}}" class="form-control input-sm super-small-input" type="text"
-                   ng-model="options.seriesOptions[name].name">
+            {{name}}
           </td>
           <td style="padding: 3px; width: 35px;">
             <ui-select ng-model="options.seriesOptions[name].color">