Merge branch 'v1.8.x'

This commit is contained in:
Torkel Ödegaard 2014-09-30 09:23:07 +02:00
commit ae2523aa59
3 changed files with 5 additions and 5 deletions

View File

@ -1,4 +1,4 @@
{ {
"version": "1.8.0", "version": "1.8.1",
"url": "http://grafanarel.s3.amazonaws.com/grafana-1.8.0.tar.gz" "url": "http://grafanarel.s3.amazonaws.com/grafana-1.8.1.tar.gz"
} }

View File

@ -4,7 +4,7 @@
"company": "Coding Instinct AB" "company": "Coding Instinct AB"
}, },
"name": "grafana", "name": "grafana",
"version": "1.8.0", "version": "1.8.1",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "http://github.com/torkelo/grafana.git" "url": "http://github.com/torkelo/grafana.git"

View File

@ -215,9 +215,9 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
if (id === title) { return; } if (id === title) { return; }
var self = this; var self = this;
self._getDashboardInternal(id, isTemp).then(function(dashboard) { self._getDashboardInternal(title, isTemp).then(function(dashboard) {
if (dashboard !== null) { if (dashboard !== null) {
self.deleteDashboard(id); self.deleteDashboard(title);
} }
}); });
}; };