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

6d1dd95a · bmundt · Torkel Ödegaard · 4d403267 · 6d1dd95a
Commit 6d1dd95a authored Aug 05, 2016 by bmundt Committed by Torkel Ödegaard Aug 05, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletions

public/app/features/templating/templateValuesSrv.js
+3 -1

No files found.
--- 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);
        }