Commit 546f9031 by Torkel Ödegaard

ds: minor fix that resets data source model when switching data source type

parent c2b05341
...@@ -58,7 +58,7 @@ export class DataSourceEditCtrl { ...@@ -58,7 +58,7 @@ export class DataSourceEditCtrl {
} }
initNewDatasourceModel() { initNewDatasourceModel() {
this.current = angular.copy(defaults); this.current = _.cloneDeep(defaults);
// We are coming from getting started // We are coming from getting started
if (this.$location.search().gettingstarted) { if (this.$location.search().gettingstarted) {
...@@ -93,11 +93,21 @@ export class DataSourceEditCtrl { ...@@ -93,11 +93,21 @@ export class DataSourceEditCtrl {
}); });
} }
userChangedType() {
// reset model but keep name & default flag
this.current = _.defaults({
id: this.current.id,
name: this.current.name,
isDefault: this.current.isDefault,
type: this.current.type,
}, _.cloneDeep(defaults));
this.typeChanged();
}
typeChanged() { typeChanged() {
this.hasDashboards = false; this.hasDashboards = false;
return this.backendSrv.get('/api/plugins/' + this.current.type + '/settings').then(pluginInfo => { return this.backendSrv.get('/api/plugins/' + this.current.type + '/settings').then(pluginInfo => {
this.datasourceMeta = pluginInfo; this.datasourceMeta = pluginInfo;
console.log(this.datasourceMeta) ;
this.hasDashboards = _.find(pluginInfo.includes, {type: 'dashboard'}); this.hasDashboards = _.find(pluginInfo.includes, {type: 'dashboard'});
}); });
} }
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<div class="gf-form"> <div class="gf-form">
<span class="gf-form-label width-7">Type</span> <span class="gf-form-label width-7">Type</span>
<div class="gf-form-select-wrapper max-width-23"> <div class="gf-form-select-wrapper max-width-23">
<select class="gf-form-input" ng-model="ctrl.current.type" ng-options="v.id as v.name for v in ctrl.types" ng-change="ctrl.typeChanged()"></select> <select class="gf-form-input" ng-model="ctrl.current.type" ng-options="v.id as v.name for v in ctrl.types" ng-change="ctrl.userChangedType()"></select>
</div> </div>
</div> </div>
</div> </div>
......
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