fix(ds_edit): dont show warning when data source does not support testing, fixes #4811

2016-04-26 10:59:57 +02:00
parent 6bc898b215
commit 0762c38d35
2 changed files with 5 additions and 5 deletions
@@ -98,9 +98,7 @@ export class DataSourceEditCtrl {

      this.datasourceSrv.get(this.current.name).then(datasource => {
        if (!datasource.testDatasource) {
-          this.testing.message = 'Data source does not support test connection feature.';
-          this.testing.status = 'warning';
-          this.testing.title = 'Unknown';
+          delete this.testing;
          return;
        }

@@ -118,7 +116,9 @@ export class DataSourceEditCtrl {
          }
        });
      }).finally(() => {
-        this.testing.done = true;
+        if (this.testing) {
+          this.testing.done = true;
+        }
      });
    }

@@ -53,7 +53,7 @@
 			</plugin-component>
 			</rebuild-on-change>

-			<div ng-if="ctrl.testing" style="margin-top: 25px">
+			<div ng-if="ctrl.testing" class="gf-form-group">
 				<h5 ng-show="!ctrl.testing.done">Testing.... <i class="fa fa-spiner fa-spin"></i></h5>
 				<div class="alert-{{ctrl.testing.status}} alert">
 					<div class="alert-title">{{ctrl.testing.title}}</div>