feat(templating): progress on variable system refactoring, #6048

This commit is contained in:
Torkel Ödegaard
2016-09-19 18:06:36 +02:00
parent 945b5ee3cf
commit 9d6ecc6361
9 changed files with 124 additions and 145 deletions

View File

@@ -15,7 +15,7 @@ export class DatasourceVariable implements Variable {
name: '',
hide: 0,
label: '',
current: {text: '', value: ''}
current: {text: '', value: ''},
regex: '',
options: [],
query: '',
@@ -32,7 +32,7 @@ export class DatasourceVariable implements Variable {
}
setValue(option) {
this.variableSrv.setOptionAsCurrent(this, option);
return this.variableSrv.setOptionAsCurrent(this, option);
}
updateOptions() {
@@ -63,6 +63,7 @@ export class DatasourceVariable implements Variable {
}
this.options = options;
return this.variableSrv.validateVariableSelectionState(this);
}
dependsOn(variable) {