瀏覽代碼

Allow commas on template variable #7681 (#7732)

This improvement allows to wrap an "expression" when using single or
double quotes. So now you can have time interval with offset for
influxdb.
Denis Doria 8 年之前
父節點
當前提交
31866b5e57
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3 2
      public/app/features/templating/interval_variable.ts

+ 3 - 2
public/app/features/templating/interval_variable.ts

@@ -59,8 +59,9 @@ export class IntervalVariable implements Variable {
   }
 
   updateOptions() {
-   // extract options in comma separated string
-    this.options = _.map(this.query.split(/[,]+/), function(text) {
+    // extract options between quotes and/or comma
+    this.options = _.map(this.query.match(/(["'])(.*?)\1|\w+/g), function(text) {
+      text = text.replace(/["']+/g, '');
       return {text: text.trim(), value: text.trim()};
     });