Commit 1508d0ac by Torkel Ödegaard

TemplatOCing: Fix to allow custom template variables to contain white space, now…

TemplatOCing: Fix to allow custom template variables to contain white space, now only splits on ',', Fixes #1363
parent d3c37bda
......@@ -14,6 +14,7 @@
- [Issue #1309](https://github.com/grafana/grafana/issues/1309). Graph: Fixed issue when using zero as a grid threshold
- [Issue #1345](https://github.com/grafana/grafana/issues/1345). UI: Fixed position of confirm modal when scrolled down
- [Issue #1372](https://github.com/grafana/grafana/issues/1372). Graphite: Fix for nested complex queries, where a query references a query that references another query (ie the #[A-Z] syntax)
- [Issue #1363](https://github.com/grafana/grafana/issues/1363). Templating: Fix to allow custom template variables to contain white space, now only splits on ','
**Tech**
- [Issue #1311](https://github.com/grafana/grafana/issues/1311). Tech: Updated Font-Awesome from 3.2 to 4.2
......
......@@ -81,7 +81,7 @@ function (angular, _, kbn) {
this._updateNonQueryVariable = function(variable) {
// extract options in comma seperated string
variable.options = _.map(variable.query.split(/[\s,]+/), function(text) {
variable.options = _.map(variable.query.split(/[,]+/), function(text) {
return { text: text, value: text };
});
......
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