fix(templating): improved detection of nested template variables, fixes grafana#4986, fixes grafana#4987

torkelo · torkelo · commit 35f55cabf0d8 · 2016-05-12T10:41:15.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # 3.0.2 Stable (unreleased)
 
 * **Templating**: Fixed issue mixing row repeat and panel repeats, fixes [#4988](https://github.com/grafana/grafana/issues/4988)
+* **Templating**: Fixed issue detecting dependencies in nested variables, fixes [#4987](https://github.com/grafana/grafana/issues/4987), fixes [#4986](https://github.com/grafana/grafana/issues/4986)
 
 # 3.0.1 Stable (2016-05-11)
 
diff --git a/public/app/features/templating/templateSrv.js b/public/app/features/templating/templateSrv.js
@@ -97,7 +97,8 @@ function (angular, _) {
       if (!str) {
         return false;
       }
-      return str.indexOf('$' + variableName) !== -1 || str.indexOf('[[' + variableName + ']]') !== -1;
+      var match = this._regex.exec(str);
+      return match && (match[1] === variableName || match[2] === variableName);
     };
 
     this.highlightVariablesAsHtml = function(str) {
diff --git a/public/test/specs/templateSrv-specs.js b/public/test/specs/templateSrv-specs.js
@@ -190,6 +190,11 @@ define([
         expect(contains).to.be(true);
       });
 
+      it('should not find it if only part matches with $var syntax', function() {
+        var contains = _templateSrv.containsVariable('this.$ServerDomain.filters', 'Server');
+        expect(contains).to.be(false);
+      });
+
       it('should find it with [[var]] syntax', function() {
         var contains = _templateSrv.containsVariable('this.[[test]].filters', 'test');
         expect(contains).to.be(true);

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,8 @@ function (angular, _) {`
`97`	`97`	`if (!str) {`
`98`	`98`	`return false;`
`99`	`99`	`}`
`100`		`- return str.indexOf('$' + variableName) !== -1 \|\| str.indexOf('[[' + variableName + ']]') !== -1;`
	`100`	`+ var match = this._regex.exec(str);`
	`101`	`+ return match && (match[1] === variableName \|\| match[2] === variableName);`
`101`	`102`	`};`
`102`	`103`
`103`	`104`	`this.highlightVariablesAsHtml = function(str) {`