From 948a5259a2c3b2eb6fa3a6fa06cdc5c9d7b9e5d6 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Tue, 31 Oct 2017 15:53:45 +0300
Subject: [PATCH] fix: color picker bug at series overrides page, #9715 (#9738)

---
 .../app/core/components/colorpicker/SeriesColorPicker.tsx | 2 +-
 public/app/plugins/panel/graph/series_overrides_ctrl.js   | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/public/app/core/components/colorpicker/SeriesColorPicker.tsx b/public/app/core/components/colorpicker/SeriesColorPicker.tsx
index 6b6d387a2b2..3b24b9a4661 100644
--- a/public/app/core/components/colorpicker/SeriesColorPicker.tsx
+++ b/public/app/core/components/colorpicker/SeriesColorPicker.tsx
@@ -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>
     );
diff --git a/public/app/plugins/panel/graph/series_overrides_ctrl.js b/public/app/plugins/panel/graph/series_overrides_ctrl.js
index 2df993ff70e..5ee5b5e8e47 100644
--- a/public/app/plugins/panel/graph/series_overrides_ctrl.js
+++ b/public/app/plugins/panel/graph/series_overrides_ctrl.js
@@ -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();