Commit 8c7f4ac1 by Alexander Zobnin

fix datasource testing

parent 4822c025
...@@ -118,7 +118,7 @@ export class DataSourceEditCtrl { ...@@ -118,7 +118,7 @@ export class DataSourceEditCtrl {
} }
testDatasource() { testDatasource() {
this.datasourceSrv.get(this.current.name).then(datasource => { return this.datasourceSrv.get(this.current.name).then(datasource => {
if (!datasource.testDatasource) { if (!datasource.testDatasource) {
return; return;
} }
...@@ -126,7 +126,7 @@ export class DataSourceEditCtrl { ...@@ -126,7 +126,7 @@ export class DataSourceEditCtrl {
this.testing = { done: false, status: 'error' }; this.testing = { done: false, status: 'error' };
// make test call in no backend cache context // make test call in no backend cache context
this.backendSrv return this.backendSrv
.withNoBackendCache(() => { .withNoBackendCache(() => {
return datasource return datasource
.testDatasource() .testDatasource()
...@@ -161,8 +161,8 @@ export class DataSourceEditCtrl { ...@@ -161,8 +161,8 @@ export class DataSourceEditCtrl {
return this.backendSrv.put('/api/datasources/' + this.current.id, this.current).then(result => { return this.backendSrv.put('/api/datasources/' + this.current.id, this.current).then(result => {
this.current = result.datasource; this.current = result.datasource;
this.updateNav(); this.updateNav();
this.updateFrontendSettings().then(() => { return this.updateFrontendSettings().then(() => {
this.testDatasource(); return this.testDatasource();
}); });
}); });
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment