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

Merge pull request #14099 from alexanderzobnin/fix-14098

Browse Source 
fix datasource testing
This commit is contained in:
Torkel Ödegaard 2018-11-16 11:34:30 +01:00 committed by GitHub
commit 907c84f7d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/features/plugins/ds_edit_ctrl.ts
View File

@ -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 {
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 {
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 {