Просмотр исходного кода

fix(graph): fixed showing rendering error in inspector, fixes #5995

Torkel Ödegaard 9 лет назад
Родитель
Сommit
014b70ded9

+ 1 - 1
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',

+ 3 - 3
public/app/partials/inspector.html

@@ -68,9 +68,9 @@
 </pre>
 
 			<label>Stack trace:</label>
-			<pre>
-			{{stack_trace}}
-		</pre>
+<pre>
+{{stack_trace}}
+</pre>
 
 		</div>
 

+ 1 - 1
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) {