From 82fc2803f0bcea87ddc1083375533fd0bb79b4c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 15 Apr 2020 17:40:02 +0200
Subject: [PATCH] Table: Fixed error going into new panel edit (#23594)

---
 public/app/plugins/panel/table-old/column_options.ts | 4 ++--
 public/app/plugins/panel/table-old/editor.ts         | 2 +-
 public/app/plugins/panel/table-old/module.ts         | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/public/app/plugins/panel/table-old/column_options.ts b/public/app/plugins/panel/table-old/column_options.ts
index d4fcabc95cf..ee84684c1c8 100644
--- a/public/app/plugins/panel/table-old/column_options.ts
+++ b/public/app/plugins/panel/table-old/column_options.ts
@@ -157,12 +157,12 @@ export class ColumnOptionsCtrl {
   }
 }
 
-export function columnOptionsTab(uiSegmentSrv: any) {
+export function columnOptionsTab() {
   'use strict';
   return {
     restrict: 'E',
     scope: true,
-    templateUrl: 'public/app/plugins/panel/table/column_options.html',
+    templateUrl: 'public/app/plugins/panel/table-old/column_options.html',
     controller: ColumnOptionsCtrl,
   };
 }
diff --git a/public/app/plugins/panel/table-old/editor.ts b/public/app/plugins/panel/table-old/editor.ts
index f81d70b9517..2b6edb2abe5 100644
--- a/public/app/plugins/panel/table-old/editor.ts
+++ b/public/app/plugins/panel/table-old/editor.ts
@@ -94,7 +94,7 @@ export function tablePanelEditor(uiSegmentSrv: any) {
   return {
     restrict: 'E',
     scope: true,
-    templateUrl: 'public/app/plugins/panel/table/editor.html',
+    templateUrl: 'public/app/plugins/panel/table-old/editor.html',
     controller: TablePanelEditorCtrl,
   };
 }
diff --git a/public/app/plugins/panel/table-old/module.ts b/public/app/plugins/panel/table-old/module.ts
index 4354fd17129..040e8a7b0e5 100644
--- a/public/app/plugins/panel/table-old/module.ts
+++ b/public/app/plugins/panel/table-old/module.ts
@@ -7,7 +7,6 @@ import { tablePanelEditor } from './editor';
 import { columnOptionsTab } from './column_options';
 import { TableRenderer } from './renderer';
 import { isTableData, PanelEvents, PanelPlugin } from '@grafana/data';
-import { TemplateSrv } from 'app/features/templating/template_srv';
 import { dispatch } from 'app/store/store';
 import { ComponentType } from 'react';
 import { PanelProps } from '@grafana/data';
@@ -56,7 +55,6 @@ export class TablePanelCtrl extends MetricsPanelCtrl {
   constructor(
     $scope: any,
     $injector: any,
-    templateSrv: TemplateSrv,
     private annotationsSrv: any,
     private $sanitize: any,
     private variableSrv: any