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: Using table cell links and ad hoc filters together now works & looks correct, fixes #8052

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-08-10 14:12:31 +02:00
parent d2437d3cf1
commit c7959ff06e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/app/plugins/panel/table/renderer.ts
View File

@ -157,9 +157,9 @@ export class TableRenderer {
// because of the fixed table headers css only solution
// there is an issue if header cell is wider the cell
// this hack adds header content to cell (not visible)
var widthHack = '';
var columnHtml = '';
if (addWidthHack) {
widthHack = '<div class="table-panel-width-hack">' + this.table.columns[columnIndex].title + '</div>';
columnHtml = '<div class="table-panel-width-hack">' + this.table.columns[columnIndex].title + '</div>';
}
if (value === undefined) {
@ -173,8 +173,6 @@ export class TableRenderer {
cellClasses.push("table-panel-cell-pre");
}
var columnHtml = widthHack + value;
if (column.style && column.style.link) {
// Render cell as link
var scopedVars = this.renderRowVariables(rowIndex);
@ -185,11 +183,13 @@ export class TableRenderer {
var cellTarget = column.style.linkTargetBlank ? '_blank' : '';
cellClasses.push("table-panel-cell-link");
columnHtml = `
columnHtml += `
<a href="${cellLink}" target="${cellTarget}" data-link-tooltip data-original-title="${cellLinkTooltip}" data-placement="right">
${columnHtml}
${value}
</a>
`;
} else {
columnHtml += value;
}
if (column.filterable) {

2
public/sass/components/_panel_table.scss
View File

@ -84,7 +84,7 @@
a {
padding: 0.45em 0 0.45em 1.1em;
height: 100%;
width: 100%;
display: inline-block;
}
}