Pārlūkot izejas kodu

Fixed issue with dashlinks/panellinks and sending template variable value 'All', Fixes #2297

Torkel Ödegaard 10 gadi atpakaļ
vecāks
revīzija
8d7ac3862c
1 mainītis faili ar 9 papildinājumiem un 1 dzēšanām
  1. 9 1
      public/app/features/templating/templateSrv.js

+ 9 - 1
public/app/features/templating/templateSrv.js

@@ -116,8 +116,16 @@ function (angular, _) {
     };
 
     this.fillVariableValuesForUrl = function(params) {
+      var toUrlVal = function(current) {
+        if (current.text === 'All') {
+          return 'All';
+        } else {
+          return current.value;
+        }
+      };
+
       _.each(this.variables, function(variable) {
-        params['var-' + variable.name] = variable.current.value;
+        params['var-' + variable.name] = toUrlVal(variable.current);
       });
     };