From 8d7ac3862c3f12df3ee3abea46bc858fd67a11c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 7 Jul 2015 14:28:49 +0200 Subject: [PATCH] Fixed issue with dashlinks/panellinks and sending template variable value 'All', Fixes #2297 --- public/app/features/templating/templateSrv.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/public/app/features/templating/templateSrv.js b/public/app/features/templating/templateSrv.js index 4c9d47ae2e2..40b661b0cbc 100644 --- a/public/app/features/templating/templateSrv.js +++ b/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); }); };