소스 검색

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

Torkel Ödegaard 11 년 전
부모
커밋
1508d0ac23
2개의 변경된 파일2개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 0
      CHANGELOG.md
  2. 1 1
      src/app/features/templating/templateValuesSrv.js

+ 1 - 0
CHANGELOG.md

@@ -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

+ 1 - 1
src/app/features/templating/templateValuesSrv.js

@@ -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 };
       });
       });