public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small fix to error handling

Browse Source
This commit is contained in:
Torkel Ödegaard
2013-12-25 16:40:49 +01:00
parent 037837852f
commit bb6068ac8c
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/panels/graphite/editor.html
+2 -2
View File
@@ -29,14 +29,14 @@
</li> </li>
</ul> </ul>
<!-- <input type="text" <input type="text"
class="grafana-target-text-input" class="grafana-target-text-input"
ng-model="target.target" ng-model="target.target"
focus-me="showTextEditor" focus-me="showTextEditor"
ng-blur="showTextEditor = false" ng-blur="showTextEditor = false"
ng-model-onblur ng-change="targetChanged()" ng-model-onblur ng-change="targetChanged()"
ng-show="showTextEditor" /> ng-show="showTextEditor" />
-->
<ul class="grafana-segment-list" role="menu" ng-hide="showTextEditor"> <ul class="grafana-segment-list" role="menu" ng-hide="showTextEditor">
<li class="dropdown" ng-repeat="segment in segments" role="menuitem"> <li class="dropdown" ng-repeat="segment in segments" role="menuitem">
<a tabindex="1" <a tabindex="1"
src/app/panels/graphite/module.js
+4 -2
View File
@@ -322,12 +322,14 @@ function (angular, app, $, _, kbn, moment, timeSeries, graphiteSrv, RQ) {
]); ]);
result(function (data, failure) { result(function (data, failure) {
if (failure) { $scope.panelMeta.loading = false;
if (failure || !data) {
$scope.panel.error = 'Failed to do fetch graphite data: ' + failure; $scope.panel.error = 'Failed to do fetch graphite data: ' + failure;
$scope.$apply();
return; return;
} }
$scope.panelMeta.loading = false;
$scope.$apply(); $scope.$apply();
// Tell the histogram directive to render. // Tell the histogram directive to render.