Commit 8dfe4a97 by Marcus Efraimsson

use uid when linking to dashboards internally in a dashboard

parent 817179c0
......@@ -144,8 +144,7 @@ export class DashLinksContainerCtrl {
if (dash.id !== currentDashId) {
memo.push({
title: dash.title,
url: 'dashboard/' + dash.uri,
target: link.target,
url: dash.url,
icon: 'fa fa-th-large',
keepTime: link.keepTime,
includeVars: link.includeVars,
......
......@@ -77,6 +77,10 @@ export class LinkSrv {
info.target = link.targetBlank ? '_blank' : '_self';
info.href = this.templateSrv.replace(link.url || '', scopedVars);
info.title = this.templateSrv.replace(link.title || '', scopedVars);
} else if (link.url) {
info.href = link.url;
info.title = this.templateSrv.replace(link.title || '', scopedVars);
info.target = link.targetBlank ? '_blank' : '';
} else if (link.dashUri) {
info.href = 'dashboard/' + link.dashUri + '?';
info.title = this.templateSrv.replace(link.title || '', scopedVars);
......
......@@ -39,7 +39,12 @@ export class PanelLinksEditorCtrl {
backendSrv.search({ query: link.dashboard }).then(function(hits) {
var dashboard = _.find(hits, { title: link.dashboard });
if (dashboard) {
link.dashUri = dashboard.uri;
if (dashboard.url) {
link.url = dashboard.url;
} else {
// To support legacy url's
link.dashUri = dashboard.uri;
}
link.title = dashboard.title;
}
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment