IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Small improvement to dashboard loading error handling

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-03-31 14:03:01 +02:00
parent aa724fc11e
commit b83367063e
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
public/app/routes/dashLoadControllers.js
View File

@@ -12,12 +12,15 @@ function (angular, _, kbn, moment, $) {
module.controller('DashFromDBCtrl', function($scope, $routeParams, backendSrv) {
function dashboardLoadFailed(title) {
$scope.initDashboard({meta: {}, model: {title: title}}, $scope);
}
if (!$routeParams.slug) {
backendSrv.get('/api/dashboards/home').then(function(result) {
$scope.initDashboard(result, $scope);
},function() {
$scope.initDashboard({}, $scope);
$scope.appEvent('alert-error', ['Load dashboard failed', '']);
dashboardLoadFailed('Not found');
});
return;
@@ -26,17 +29,15 @@ function (angular, _, kbn, moment, $) {
return backendSrv.getDashboard($routeParams.slug).then(function(result) {
$scope.initDashboard(result, $scope);
}, function() {
$scope.initDashboard({
meta: {},
model: { title: 'Not found' }
}, $scope);
dashboardLoadFailed('Not found');
});
});
module.controller('DashFromSnapshotCtrl', function($scope, $routeParams, backendSrv) {
backendSrv.get('/api/snapshots/' + $routeParams.key).then(function(result) {
$scope.initDashboard(result, $scope);
},function() {
}, function() {
$scope.initDashboard({meta: {isSnapshot: true}, model: {title: 'Snapshot not found'}}, $scope);
});
});