adds check for making datasource template variables children of other template variables (grafana#5717)

bmundt · torkelo · commit 6d1dd95ab340 · 2016-08-05T10:03:46.000+02:00
diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js
@@ -166,7 +166,9 @@ function (angular, _, $, kbn) {
         if (otherVariable === updatedVariable) {
           return;
         }
-        if (templateSrv.containsVariable(otherVariable.query, updatedVariable.name) ||
+        if ((otherVariable.type === "datasource" &&
+            templateSrv.containsVariable(otherVariable.regex, updatedVariable.name)) ||
+            templateSrv.containsVariable(otherVariable.query, updatedVariable.name) ||
             templateSrv.containsVariable(otherVariable.datasource, updatedVariable.name)) {
           return self.updateOptions(otherVariable);
         }

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,9 @@ function (angular, _, $, kbn) {`
`166`	`166`	`if (otherVariable === updatedVariable) {`
`167`	`167`	`return;`
`168`	`168`	`}`
`169`		`- if (templateSrv.containsVariable(otherVariable.query, updatedVariable.name) \|\|`
	`169`	`+ if ((otherVariable.type === "datasource" &&`
	`170`	`+ templateSrv.containsVariable(otherVariable.regex, updatedVariable.name)) \|\|`
	`171`	`+ templateSrv.containsVariable(otherVariable.query, updatedVariable.name) \|\|`
`170`	`172`	`templateSrv.containsVariable(otherVariable.datasource, updatedVariable.name)) {`
`171`	`173`	`return self.updateOptions(otherVariable);`
`172`	`174`	`}`