Merge branch 'master' of github.com:torkelo/grafana-private into pro

src/app/controllers/search.js

@@ -119,9 +119,10 @@ function (angular, _, config, $) {
       $scope.searchDashboards($scope.query.query);
     };
 
-    $scope.deleteDashboard = function(id, evt) {
+    $scope.deleteDashboard = function(dash, evt) {
       evt.stopPropagation();
-      $scope.emitAppEvent('delete-dashboard', { id: id });
+      $scope.emitAppEvent('delete-dashboard', { id: dash.id });
+      $scope.results.dashboards = _.without($scope.results.dashboards, dash);
     };
 
     $scope.addMetricToCurrentDashboard = function (metricId) {

src/app/partials/search.html

@@ -54,7 +54,7 @@
 					<a ng-click="shareDashboard(row.id, row.id, $event)" config-modal="app/partials/dashLoaderShare.html">
 						<i class="icon-share"></i> share &nbsp;&nbsp;&nbsp;
 					</a>
-					<a ng-click="deleteDashboard(row.id, $event)">
+					<a ng-click="deleteDashboard(row, $event)">
 						<i class="icon-remove"></i> delete
 					</a>
 				</div>