IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix series overrides

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-01-26 17:54:57 -05:00
parent aac190eaa9
commit e6013353d2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/plugins/panel/graph/module.ts
View File

@ -4,6 +4,7 @@ import {GraphCtrl} from './graph_ctrl';
import './graph'; import './graph';
import './legend'; import './legend';
import './seriesOverridesCtrl';
class GraphPanel extends PanelDirective { class GraphPanel extends PanelDirective {
controller = GraphCtrl; controller = GraphCtrl;

11
public/app/plugins/panel/graph/seriesOverridesCtrl.js
View File

@ -45,18 +45,19 @@ define([
} }
$scope.updateCurrentOverrides(); $scope.updateCurrentOverrides();
$scope.render(); $scope.ctrl.render();
}; };
$scope.colorSelected = function(color) { $scope.colorSelected = function(color) {
$scope.override['color'] = color; $scope.override['color'] = color;
$scope.updateCurrentOverrides(); $scope.updateCurrentOverrides();
$scope.render(); $scope.ctrl.render();
}; };
$scope.openColorSelector = function() { $scope.openColorSelector = function() {
var popoverScope = $scope.$new(); var popoverScope = $scope.$new();
popoverScope.colorSelected = $scope.colorSelected; popoverScope.colorSelected = $scope.colorSelected;
popoverScope.colors = $scope.ctrl.colors;
popoverSrv.show({ popoverSrv.show({
element: $element.find(".dropdown"), element: $element.find(".dropdown"),
@ -69,11 +70,11 @@ define([
$scope.removeOverride = function(option) { $scope.removeOverride = function(option) {
delete $scope.override[option.propertyName]; delete $scope.override[option.propertyName];
$scope.updateCurrentOverrides(); $scope.updateCurrentOverrides();
$scope.render(); $scope.ctrl.render();
}; };
$scope.getSeriesNames = function() { $scope.getSeriesNames = function() {
return _.map($scope.seriesList, function(series) { return _.map($scope.ctrl.seriesList, function(series) {
return series.alias; return series.alias;
}); });
}; };
@ -107,7 +108,5 @@ define([
$scope.addOverrideOption('Transform', 'transform', ['negative-Y']); $scope.addOverrideOption('Transform', 'transform', ['negative-Y']);
$scope.addOverrideOption('Legend', 'legend', [true, false]); $scope.addOverrideOption('Legend', 'legend', [true, false]);
$scope.updateCurrentOverrides(); $scope.updateCurrentOverrides();
}); });
}); });