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

TemplatOCing: Fix to allow custom template variables to contain white space, now only splits on ',', Fixes #1363

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-01-23 10:41:23 +01:00
parent d3c37bda71
commit 1508d0ac23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -14,6 +14,7 @@
- [Issue #1309](https://github.com/grafana/grafana/issues/1309). Graph: Fixed issue when using zero as a grid threshold - [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 #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 #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** **Tech**
- [Issue #1311](https://github.com/grafana/grafana/issues/1311). Tech: Updated Font-Awesome from 3.2 to 4.2 - [Issue #1311](https://github.com/grafana/grafana/issues/1311). Tech: Updated Font-Awesome from 3.2 to 4.2

2
src/app/features/templating/templateValuesSrv.js
View File

@ -81,7 +81,7 @@ function (angular, _, kbn) {
this._updateNonQueryVariable = function(variable) { this._updateNonQueryVariable = function(variable) {
// extract options in comma seperated string // 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 }; return { text: text, value: text };
}); });