Merge pull request #244 from alison985/204_fix_unable_to_save

204 fix unable to save
mozilla · Sep 1, 2017 · 031fe4d · 031fe4d
2 parents 3df714d + 9232134
commit 031fe4d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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">

diff --git 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;