public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
bmundt authored and Torkel Ödegaard committed 2016-08-05 10:03:46 +02:00
1 parent 4d40326706
commit 6d1dd95ab3
1 file changed
+3 -1
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/templating/templateValuesSrv.js
+3 -1
View File
@@ -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);
}