From 9f766557f1275f46f9bca0139d5249fdd73a5cdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 15 Dec 2014 17:30:01 +0100 Subject: [PATCH] Dashboard: fixed minor issue when trying to aborting dashboard delete from search list, Fixes #1233 --- src/app/controllers/dashboardNavCtrl.js | 1 + src/app/controllers/search.js | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/src/app/controllers/dashboardNavCtrl.js b/src/app/controllers/dashboardNavCtrl.js index 3e3321b7d0d..14a914821b1 100644 --- a/src/app/controllers/dashboardNavCtrl.js +++ b/src/app/controllers/dashboardNavCtrl.js @@ -107,6 +107,7 @@ function (angular, _, moment, config, store) { $scope.deleteDashboardConfirmed = function(options) { var id = options.id; $scope.db.deleteDashboard(id).then(function(id) { + $scope.appEvent('dashboard-deleted', id); $scope.appEvent('alert-success', ['Dashboard Deleted', id + ' has been deleted']); }, function(err) { $scope.appEvent('alert-error', ['Deleted failed', err]); diff --git a/src/app/controllers/search.js b/src/app/controllers/search.js index 4977ced75af..3abcf4ec0a3 100644 --- a/src/app/controllers/search.js +++ b/src/app/controllers/search.js @@ -19,6 +19,9 @@ function (angular, _, config, $) { $scope.db = datasourceSrv.getGrafanaDB(); $scope.currentSearchId = 0; + // events + $scope.onAppEvent('dashboard-deleted', $scope.dashboardDeleted); + $timeout(function() { $scope.giveSearchFocus = $scope.giveSearchFocus + 1; $scope.query.query = 'title:'; @@ -123,6 +126,10 @@ function (angular, _, config, $) { $scope.deleteDashboard = function(dash, evt) { evt.stopPropagation(); $scope.appEvent('delete-dashboard', { id: dash.id, title: dash.title }); + }; + + $scope.dashboardDeleted = function(evt, id) { + var dash = _.findWhere($scope.results.dashboards, {id: id}); $scope.results.dashboards = _.without($scope.results.dashboards, dash); };