From 1818000da84ecf83ac2bb24e0ce61ab3ae1e92a4 Mon Sep 17 00:00:00 2001 From: Rashid Khan Date: Wed, 29 May 2013 13:17:46 -0700 Subject: [PATCH] Fixed issue where dashboards with old timepicker settings would fail. Now throws error on timepicker --- panels/timepicker/module.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/panels/timepicker/module.js b/panels/timepicker/module.js index 2c72a97eda8..3a41a38982a 100644 --- a/panels/timepicker/module.js +++ b/panels/timepicker/module.js @@ -200,7 +200,8 @@ angular.module('kibana.timepicker', []) }; } - $scope.time_apply = function() { + $scope.time_apply = function() { + $scope.panel.error = ""; // Update internal time object $scope.time = $scope.time_calc(); $scope.time.field = $scope.panel.timefield @@ -213,8 +214,12 @@ angular.module('kibana.timepicker', []) $scope.panel.index, $scope.panel.index_interval ).then(function (p) { - $scope.time.index = p; - eventBus.broadcast($scope.$id,$scope.panel.group,'time',compile_time($scope.time)) + if(p.length > 0) { + $scope.time.index = p; + eventBus.broadcast($scope.$id,$scope.panel.group,'time',compile_time($scope.time)) + } else { + $scope.panel.error = "Could not match index pattern to any ElasticSearch indices" + } }); } else { $scope.time.index = [$scope.panel.index];