mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Fixed issue with test data source connection and direct access, Fixes #2219
This commit is contained in:
parent
ec98f9181b
commit
7806da11e6
@ -58,7 +58,7 @@ function (angular, config) {
|
||||
};
|
||||
|
||||
$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.defaultDatasource = settings.defaultDatasource;
|
||||
datasourceSrv.init();
|
||||
@ -101,12 +101,13 @@ function (angular, config) {
|
||||
|
||||
if ($scope.current.id) {
|
||||
return backendSrv.put('/api/datasources/' + $scope.current.id, $scope.current).then(function() {
|
||||
$scope.updateFrontendSettings();
|
||||
if (test) {
|
||||
$scope.testDatasource();
|
||||
} else {
|
||||
$location.path('datasources');
|
||||
}
|
||||
$scope.updateFrontendSettings().then(function() {
|
||||
if (test) {
|
||||
$scope.testDatasource();
|
||||
} else {
|
||||
$location.path('datasources');
|
||||
}
|
||||
});
|
||||
});
|
||||
} else {
|
||||
return backendSrv.post('/api/datasources', $scope.current).then(function(result) {
|
||||
|
Loading…
Reference in New Issue
Block a user