jprdonnelly/redash
1
0
Fork 0
mirror of https://github.com/getredash/redash.git synced 2025-12-25 01:03:20 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #615 from EverythingMe/fix_y_axis

Browse Source 
Fix: y axis settings should take into account two axes
This commit is contained in:
Arik Fraimovich
2015-10-19 11:33:12 +03:00
parent 070caa6976 39b8f40ad4
commit a5bc90c816
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rd_ui/app/scripts/visualizations/chart.js
View File

@@ -244,11 +244,12 @@
scope.visualization.options.xAxis.type = xAxisType;
});
scope.yAxisType = (scope.visualization.options.yAxis && scope.visualization.options.yAxis.type) || scope.yAxisType;
scope.visualization.options.yAxis = scope.visualization.options.yAxis || [{type: 'linear'}, {type: 'linear', opposite: true}];
scope.yAxisType = (scope.visualization.options.yAxis && scope.visualization.options.yAxis[0].type) || scope.yAxisType;
yAxisUnwatch = scope.$watch("yAxisType", function (yAxisType) {
scope.visualization.options.yAxis = scope.visualization.options.yAxis || {};
scope.visualization.options.yAxis.type = yAxisType;
scope.visualization.options.yAxis[0].type = yAxisType;
scope.visualization.options.yAxis[1].type = yAxisType;
});
} else {
if (chartOptionsUnwatch) {

2
rd_ui/app/views/visualizations/chart_editor.html
View File

@@ -60,7 +60,7 @@
<div class="col-sm-10">
<input name="yAxisName" type="text" class="form-control"
ng-model="visualization.options.yAxis.title.text"
ng-model="visualization.options.yAxis[0].title.text"
placeholder="">
</div>
</div>