energylink/grafana

commit 0e970307160dfed9b09f6d1bf06dd49ff38035b7
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Wed Dec 17 03:09:25 2014 +0100

    More datasource admin, and backendSrv work

diff --git a/src/app/controllers/pro/datasourcesCtrl.js b/src/app/controllers/pro/datasourcesCtrl.js
index 2086cb2a0..6750015a6 100644
--- a/src/app/controllers/pro/datasourcesCtrl.js
+++ b/src/app/controllers/pro/datasourcesCtrl.js
@@ -25,14 +25,10 @@ function (angular) {
         return;
       }
 
-      backendSrv.request({
-        method: 'POST',
-        url: '/api/admin/datasource/add',
-        data: $scope.current,
-        desc: 'Add data source'
-      }).then(function(result) {
-        console.log('add datasource result', result);
-      });
+      backendSrv.post('/api/admin/datasources/add', $scope.current)
+        .then(function(result) {
+          console.log('add datasource result', result);
+        });
     };
 
     $scope.init();
diff --git a/src/app/services/pro/backendSrv.js b/src/app/services/pro/backendSrv.js
index 02762a801..b2a38de5e 100644
--- a/src/app/services/pro/backendSrv.js
+++ b/src/app/services/pro/backendSrv.js
@@ -26,7 +26,9 @@ function (angular, _) {
 
       return $http(httpOptions).then(function(results) {
         if (options.method !== 'GET') {
-          alertSrv.set(options.desc + ' OK ', '', 'success', 3000);
+          if (results && results.data.message) {
+            alertSrv.set(results.data.message, '', 'success', 3000);
+          }
         }
         return results.data;
       }, function(err) {
@@ -42,7 +44,11 @@ function (angular, _) {
           data.severity = "warning";
         }
 
-        alertSrv.set(options.desc + ' failed', data.message, data.severity, 10000);
+        if (data.message) {
+          alertSrv.set("Error", data.message, data.severity, 10000);
+        }
+
+        throw data;
       });
     };