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

fix(annotations): fixed annotation error handling, fixes #5077

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-05-18 15:22:40 +02:00
parent b6dcf6bd02
commit 10339090b8
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/features/annotations/annotations_srv.js
View File

@ -55,10 +55,11 @@ define([
}, this);
});
promiseCached = $q.all(promises)
.then(function() {
return list;
});
promiseCached = $q.all(promises).then(function() {
return list;
}).catch(function(err) {
$rootScope.appEvent('alert-error', ['Annotations failed', (err.message || err)]);
});
return promiseCached;
};