From 2d1ed7d3cca2cb45280fe6446b41aa62a20329fb Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Mon, 22 Feb 2021 14:28:35 +0100 Subject: [PATCH] ui: firewall grid: fix rendering comment, only show tooltip when truncated avoid showing "undefined" if there's no comment, renderer must not return null or undefined directly, it will converted to string as is, so always fallback to '' empty string Signed-off-by: Thomas Lamprecht --- www/manager6/grid/FirewallRules.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/www/manager6/grid/FirewallRules.js b/www/manager6/grid/FirewallRules.js index f7f304b8..cb9966ca 100644 --- a/www/manager6/grid/FirewallRules.js +++ b/www/manager6/grid/FirewallRules.js @@ -763,10 +763,12 @@ Ext.define('PVE.FirewallRules', { dataIndex: 'comment', flex: 6, renderer: function(value, metaData, record) { - let comment = render_errors('comment', Ext.util.Format.htmlEncode(value), metaData, record); - return `${comment}`; -}, - + let comment = render_errors('comment', Ext.util.Format.htmlEncode(value), metaData, record) || ''; + if (comment.length * 12 > metaData.column.cellWidth) { + comment = `${comment}`; + } + return comment; + }, }, );