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

Merge pull request #2361 from mtanda/fix_link

Browse Source 
Fix dashboard/panel link in Scripted Dashboard
This commit is contained in:
Torkel Ödegaard
2015-07-17 15:49:08 +02:00
parent 142a323efd 8ac47b4e24
commit 39430e1cee
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/dashlinks/module.js
+1 -1
View File
@@ -114,7 +114,7 @@ function (angular, _) {
title: linkDef.title, title: linkDef.title,
icon: iconMap[linkDef.icon], icon: iconMap[linkDef.icon],
tooltip: linkDef.tooltip, tooltip: linkDef.tooltip,
target: linkDef.targetBlank ? "_blank" : "", target: linkDef.targetBlank ? "_blank" : "_self",
keepTime: linkDef.keepTime, keepTime: linkDef.keepTime,
includeVars: linkDef.includeVars, includeVars: linkDef.includeVars,
}]); }]);
public/app/features/panellinks/linkSrv.js
+1 -1
View File
@@ -62,7 +62,7 @@ function (angular, kbn, _) {
this.getPanelLinkAnchorInfo = function(link) { this.getPanelLinkAnchorInfo = function(link) {
var info = {}; var info = {};
if (link.type === 'absolute') { if (link.type === 'absolute') {
info.target = link.targetBlank ? '_blank' : ''; info.target = link.targetBlank ? '_blank' : '_self';
info.href = templateSrv.replace(link.url || ''); info.href = templateSrv.replace(link.url || '');
info.title = templateSrv.replace(link.title || ''); info.title = templateSrv.replace(link.title || '');
info.href += '?'; info.href += '?';