IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(templating): fixed scoped vars issue when generating urls for panel links, fixes #2410

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-07-30 08:28:42 +02:00
parent aaae23e9f0
commit 2cc53f328b
4 changed files with 45 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/app/features/panellinks/linkSrv.js
View File

@@ -59,21 +59,21 @@ function (angular, kbn, _) {
return info;
};
this.getPanelLinkAnchorInfo = function(link) {
this.getPanelLinkAnchorInfo = function(link, scopedVars) {
var info = {};
if (link.type === 'absolute') {
info.target = link.targetBlank ? '_blank' : '_self';
info.href = templateSrv.replace(link.url || '');
info.title = templateSrv.replace(link.title || '');
info.href = templateSrv.replace(link.url || '', scopedVars);
info.title = templateSrv.replace(link.title || '', scopedVars);
info.href += '?';
}
else if (link.dashUri) {
info.href = 'dashboard/' + link.dashUri + '?';
info.title = templateSrv.replace(link.title || '');
info.title = templateSrv.replace(link.title || '', scopedVars);
info.target = link.targetBlank ? '_blank' : '';
}
else {
info.title = templateSrv.replace(link.title || '');
info.title = templateSrv.replace(link.title || '', scopedVars);
var slug = kbn.slugifyForUrl(link.dashboard || '');
info.href = 'dashboard/db/' + slug + '?';
}
@@ -87,12 +87,12 @@ function (angular, kbn, _) {
}
if (link.includeVars) {
templateSrv.fillVariableValuesForUrl(params);
templateSrv.fillVariableValuesForUrl(params, scopedVars);
}
info.href = this.addParamsToUrl(info.href, params);
if (link.params) {
info.href += "&" + templateSrv.replace(link.params);
info.href += "&" + templateSrv.replace(link.params, scopedVars);
}
return info;