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

ux(ds edit): combine save and test connection buttons, closes #4658

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-04-12 11:20:03 -04:00
parent 29dff7ba1a
commit 7afb6fa3e3
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,8 @@ var defaults = {
jsonData: {} jsonData: {}
}; };
var datasourceCreated = false;
export class DataSourceEditCtrl { export class DataSourceEditCtrl {
isNew: boolean; isNew: boolean;
datasources: any[]; datasources: any[];
@ -66,6 +68,11 @@ export class DataSourceEditCtrl {
this.backendSrv.get('/api/datasources/' + id).then(ds => { this.backendSrv.get('/api/datasources/' + id).then(ds => {
this.isNew = false; this.isNew = false;
this.current = ds; this.current = ds;
if (datasourceCreated) {
datasourceCreated = false;
this.testDatasource();
}
return this.typeChanged(); return this.typeChanged();
}); });
} }
@ -123,14 +130,14 @@ export class DataSourceEditCtrl {
if (this.current.id) { if (this.current.id) {
return this.backendSrv.put('/api/datasources/' + this.current.id, this.current).then(() => { return this.backendSrv.put('/api/datasources/' + this.current.id, this.current).then(() => {
this.updateFrontendSettings().then(() => { this.updateFrontendSettings().then(() => {
if (test) { this.testDatasource();
this.testDatasource();
}
}); });
}); });
} else { } else {
return this.backendSrv.post('/api/datasources', this.current).then(result => { return this.backendSrv.post('/api/datasources', this.current).then(result => {
this.updateFrontendSettings(); this.updateFrontendSettings();
datasourceCreated = true;
this.$location.path('datasources/edit/' + result.id); this.$location.path('datasources/edit/' + result.id);
}); });
} }

8
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="ctrl.editForm"> <form name="ctrl.editForm" ng-if="ctrl.current">
<div class="gf-form-group"> <div class="gf-form-group">
<div class="gf-form-inline"> <div class="gf-form-inline">
<div class="gf-form"> <div class="gf-form">
@ -55,7 +55,6 @@
<div ng-if="ctrl.testing" style="margin-top: 25px"> <div ng-if="ctrl.testing" style="margin-top: 25px">
<h5 ng-show="!ctrl.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="ctrl.testing.done">Test results</h5>
<div class="alert-{{ctrl.testing.status}} alert"> <div class="alert-{{ctrl.testing.status}} alert">
<div class="alert-title">{{ctrl.testing.title}}</div> <div class="alert-title">{{ctrl.testing.title}}</div>
<div ng-bind='ctrl.testing.message'></div> <div ng-bind='ctrl.testing.message'></div>
@ -64,10 +63,7 @@
<div class="gf-form-button-row"> <div class="gf-form-button-row">
<button type="submit" class="btn btn-success" ng-show="ctrl.isNew" ng-click="ctrl.saveChanges()">Add</button> <button type="submit" class="btn btn-success" ng-show="ctrl.isNew" ng-click="ctrl.saveChanges()">Add</button>
<button type="submit" class="btn btn-success" ng-show="!ctrl.isNew" ng-click="ctrl.saveChanges()">Save</button> <button type="submit" class="btn btn-success" ng-show="!ctrl.isNew" ng-click="ctrl.saveChanges()">Save &amp; Test</button>
<button type="submit" class="btn btn-secondary" ng-show="!ctrl.isNew" ng-click="ctrl.saveChanges(true)">
Test Connection
</button>
<button type="submit" class="btn btn-danger" ng-show="!ctrl.isNew" ng-click="ctrl.delete()"> <button type="submit" class="btn btn-danger" ng-show="!ctrl.isNew" ng-click="ctrl.delete()">
Delete Delete
</button> </button>

2
public/sass/_variables.dark.scss
View File

@ -27,7 +27,7 @@ $white: #fff;
// ------------------------- // -------------------------
$blue: #33B5E5; $blue: #33B5E5;
$blue-dark: #005f81; $blue-dark: #005f81;
$green: #669900; $green: #609000;
$red: #CC3900; $red: #CC3900;
$yellow: #ECBB13; $yellow: #ECBB13;
$pink: #FF4444; $pink: #FF4444;