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: color picker bug at series overrides page, #9715 (#9738)

Browse Source
This commit is contained in:
Alexander Zobnin 2017-10-31 15:53:45 +03:00 committed by Torkel Ödegaard
parent 497993e2b2
commit 948a5259a2
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/core/components/colorpicker/SeriesColorPicker.tsx
View File

@ -43,7 +43,7 @@ export class SeriesColorPicker extends React.Component<IProps, any> {
render() {
return (
<div className="graph-legend-popover">
{this.props.series && this.renderAxisSelection()}
{this.props.series.yaxis && this.renderAxisSelection()}
<ColorPickerPopover color={this.props.series.color} onColorSelect={this.onColorChange} />
</div>
);

8
public/app/plugins/panel/graph/series_overrides_ctrl.js
View File

@ -29,7 +29,7 @@ define([
$scope.setOverride = function(item, subItem) {
// handle color overrides
if (item.propertyName === 'color') {
$scope.openColorSelector();
$scope.openColorSelector($scope.override['color']);
return;
}
@ -52,15 +52,17 @@ define([
$scope.ctrl.render();
};
$scope.openColorSelector = function() {
$scope.openColorSelector = function(color) {
var fakeSeries = {color: color};
popoverSrv.show({
element: $element.find(".dropdown")[0],
position: 'top center',
openOn: 'click',
template: '<series-color-picker onColorChange="colorSelected" />',
template: '<series-color-picker series="series" onColorChange="colorSelected" />',
model: {
autoClose: true,
colorSelected: $scope.colorSelected,
series: fakeSeries
},
onClose: function() {
$scope.ctrl.render();