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

fix(datasource edit): Editing datasources broken earlier today, fixes #4343

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-03-12 00:16:08 +01:00
parent d2b0bad1cf
commit 28f4f3a8c8
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ export class DataSourceEditCtrl {
datasourceMeta: any; datasourceMeta: any;
tabIndex: number; tabIndex: number;
hasDashboards: boolean; hasDashboards: boolean;
editForm: any;
/** @ngInject */ /** @ngInject */
constructor( constructor(
@ -114,7 +115,7 @@ export class DataSourceEditCtrl {
} }
saveChanges(test) { saveChanges(test) {
if (!this.$scope.editForm.$valid) { if (!this.editForm.$valid) {
return; return;
} }

14
public/app/features/plugins/partials/ds_edit.html
View File

@ -25,7 +25,7 @@
<div ng-if="ctrl.tabIndex === 0" class="tab-content"> <div ng-if="ctrl.tabIndex === 0" class="tab-content">
<form name="editForm"> <form name="ctrl.editForm">
<div class="gf-form-group"> <div class="gf-form-group">
<div class="gf-form"> <div class="gf-form">
<span class="gf-form-label width-7">Name</span> <span class="gf-form-label width-7">Name</span>
@ -52,12 +52,12 @@
</plugin-component> </plugin-component>
</rebuild-on-change> </rebuild-on-change>
<div ng-if="testing" style="margin-top: 25px"> <div ng-if="ctrl.testing" style="margin-top: 25px">
<h5 ng-show="!testing.done">Testing.... <i class="fa fa-spiner fa-spin"></i></h5> <h5 ng-show="!ctrl.testing.done">Testing.... <i class="fa fa-spiner fa-spin"></i></h5>
<h5 ng-show="testing.done">Test results</h5> <h5 ng-show="ctrl.testing.done">Test results</h5>
<div class="alert-{{testing.status}} alert"> <div class="alert-{{ctrl.testing.status}} alert">
<div class="alert-title">{{testing.title}}</div> <div class="alert-title">{{ctrl.testing.title}}</div>
<div ng-bind='testing.message'></div> <div ng-bind='ctrl.testing.message'></div>
</div> </div>
</div> </div>