IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-10 07:35:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-09-10 12:00:33 +02:00
parent 7aab4a4a59
commit 014b70ded9
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/panel/panel_ctrl.ts
View File

@ -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',

6
public/app/partials/inspector.html
View File

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

2
public/app/plugins/panel/graph/graph.js
View File

@ -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) {