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(templating): fixed issue with current data source variable value, fixes #4934

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-05-09 10:17:30 +02:00
parent c6c07599c7
commit 040dd91d2e
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,3 +1,7 @@
# 3.0.0 stable (unreleased)
* **Templating**: Fixed issue with new data source variable not persisting current selected value, fixes [#4934](https://github.com/grafana/grafana/issues/4934)
# 3.0.0-beta7 (2016-05-02)
### Bug fixes

5
public/app/features/templating/templateValuesSrv.js
View File

@ -213,8 +213,7 @@ function (angular, _, kbn) {
this.updateOptions = function(variable) {
if (variable.type !== 'query') {
self._updateNonQueryVariable(variable);
self.setVariableValue(variable, variable.options[0]);
return $q.when([]);
return self.validateVariableSelectionState(variable);
}
return datasourceSrv.get(variable.datasource)
@ -251,7 +250,7 @@ function (angular, _, kbn) {
if (_.isArray(variable.current.value)) {
self.selectOptionsForCurrentValue(variable);
} else {
var currentOption = _.findWhere(variable.options, { text: variable.current.text });
var currentOption = _.findWhere(variable.options, {text: variable.current.text});
if (currentOption) {
return self.setVariableValue(variable, currentOption, true);
} else {

14
public/test/specs/templateValuesSrv-specs.js
View File

@ -166,7 +166,7 @@ define([
describeUpdateVariable('update custom variable', function(scenario) {
scenario.setup(function() {
scenario.variable = { type: 'custom', query: 'hej, hop, asd', name: 'test'};
scenario.variable = {type: 'custom', query: 'hej, hop, asd', name: 'test'};
});
it('should update options array', function() {
@ -286,7 +286,13 @@ define([
describeUpdateVariable('datasource variable with regex filter', function(scenario) {
scenario.setup(function() {
scenario.variable = {type: 'datasource', query: 'graphite', name: 'test', current: {}, regex: '/pee$/' };
scenario.variable = {
type: 'datasource',
query: 'graphite',
name: 'test',
current: {value: 'backend4_pee', text: 'backend4_pee'},
regex: '/pee$/'
};
scenario.metricSources = [
{name: 'backend1', meta: {id: 'influx'}},
{name: 'backend2_pee', meta: {id: 'graphite'}},
@ -300,6 +306,10 @@ define([
expect(scenario.variable.options[0].value).to.be('backend2_pee');
expect(scenario.variable.options[1].value).to.be('backend4_pee');
});
it('should keep current value if available', function() {
expect(scenario.variable.current.value).to.be('backend4_pee');
});
});
});