Fixed panel error handling issue

src/app/features/panel/panelSrv.js

@@ -104,14 +104,9 @@ function (angular, _, config) {
 
 
         $scope.getCurrentDatasource().then(function(datasource) {
         $scope.getCurrentDatasource().then(function(datasource) {
           $scope.datasource = datasource;
           $scope.datasource = datasource;
-
-          var promise = $scope.refreshData($scope.datasource);
-          if (promise) {
-            promise.then(function() { $scope.panelMeta.loading = false; });
-          } else {
+          return $scope.refreshData($scope.datasource) || $q.when({});
+        }).then(function() {
           $scope.panelMeta.loading = false;
           $scope.panelMeta.loading = false;
-          }
-
         }, function(err) {
         }, function(err) {
           console.log('Panel data error:', err);
           console.log('Panel data error:', err);
           $scope.panelMeta.loading = false;
           $scope.panelMeta.loading = false;

src/app/panels/graph/module.js

@@ -129,10 +129,10 @@ function (angular, app, $, _, kbn, moment, TimeSeries, PanelMeta) {
       $scope.annotationsPromise = annotationsSrv.getAnnotations($scope.rangeUnparsed, $scope.dashboard);
       $scope.annotationsPromise = annotationsSrv.getAnnotations($scope.rangeUnparsed, $scope.dashboard);
 
 
       return panelHelper.issueMetricQuery($scope, datasource)
       return panelHelper.issueMetricQuery($scope, datasource)
-        .then($scope.dataHandler)
-        .then(null, function() {
+        .then($scope.dataHandler, function(err) {
           $scope.seriesList = [];
           $scope.seriesList = [];
           $scope.render([]);
           $scope.render([]);
+          throw err;
         });
         });
     };
     };
 
 

src/css/less/sidemenu.less

@@ -116,7 +116,7 @@
     opacity: .7;
     opacity: .7;
     position: relative;
     position: relative;
     left: 7px;
     left: 7px;
-    top: 3px;
+    top: 5px;
     font-size: 150%;
     font-size: 150%;
   }
   }
 }
 }