IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue with test data source connection and direct access, Fixes #2219

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-06-24 21:31:16 +02:00
parent ec98f9181b
commit 7806da11e6
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
public/app/features/org/datasourceEditCtrl.js
View File

@ -58,7 +58,7 @@ function (angular, config) {
}; };
$scope.updateFrontendSettings = function() { $scope.updateFrontendSettings = function() {
backendSrv.get('/api/frontend/settings').then(function(settings) { return backendSrv.get('/api/frontend/settings').then(function(settings) {
config.datasources = settings.datasources; config.datasources = settings.datasources;
config.defaultDatasource = settings.defaultDatasource; config.defaultDatasource = settings.defaultDatasource;
datasourceSrv.init(); datasourceSrv.init();
@ -101,12 +101,13 @@ function (angular, config) {
if ($scope.current.id) { if ($scope.current.id) {
return backendSrv.put('/api/datasources/' + $scope.current.id, $scope.current).then(function() { return backendSrv.put('/api/datasources/' + $scope.current.id, $scope.current).then(function() {
$scope.updateFrontendSettings(); $scope.updateFrontendSettings().then(function() {
if (test) { if (test) {
$scope.testDatasource(); $scope.testDatasource();
} else { } else {
$location.path('datasources'); $location.path('datasources');
} }
});
}); });
} else { } else {
return backendSrv.post('/api/datasources', $scope.current).then(function(result) { return backendSrv.post('/api/datasources', $scope.current).then(function(result) {