From 014b70ded95ee91c35eb689571a7188cf5754feb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 10 Sep 2016 12:00:33 +0200 Subject: [PATCH] fix(graph): fixed showing rendering error in inspector, fixes #5995 --- public/app/features/panel/panel_ctrl.ts | 2 +- public/app/partials/inspector.html | 6 +++--- public/app/plugins/panel/graph/graph.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/app/features/panel/panel_ctrl.ts b/public/app/features/panel/panel_ctrl.ts index e58994974cd..3bcca4f3f72 100644 --- a/public/app/features/panel/panel_ctrl.ts +++ b/public/app/features/panel/panel_ctrl.ts @@ -242,7 +242,7 @@ export class PanelCtrl { var modalScope = this.$scope.$new(); modalScope.panel = this.panel; modalScope.dashboard = this.dashboard; - modalScope.inspector = angular.copy(this.inspector); + modalScope.inspector = $.extend(true, {}, this.inspector); this.publishAppEvent('show-modal', { src: 'public/app/partials/inspector.html', diff --git a/public/app/partials/inspector.html b/public/app/partials/inspector.html index 1b1510090ad..228dfc7041e 100644 --- a/public/app/partials/inspector.html +++ b/public/app/partials/inspector.html @@ -68,9 +68,9 @@ -
-			{{stack_trace}}
-		
+
+{{stack_trace}}
+
diff --git a/public/app/plugins/panel/graph/graph.js b/public/app/plugins/panel/graph/graph.js index 0978036ef9f..7493404b5e9 100755 --- a/public/app/plugins/panel/graph/graph.js +++ b/public/app/plugins/panel/graph/graph.js @@ -265,7 +265,7 @@ function (angular, $, moment, _, kbn, GraphTooltip, thresholdManExports) { console.log('flotcharts error', e); ctrl.error = e.message || "Render Error"; ctrl.renderError = true; - ctrl.inspector = {error: ctrl.error}; + ctrl.inspector = {error: e}; } if (incrementRenderCounter) {