From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 35539731B3 for ; Mon, 5 Jul 2021 15:51:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 188B0202D5 for ; Mon, 5 Jul 2021 15:50:41 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id AF2202029A for ; Mon, 5 Jul 2021 15:50:39 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 66D5E40C4D for ; Mon, 5 Jul 2021 15:50:39 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 5 Jul 2021 15:50:31 +0200 Message-Id: <20210705135033.101390-5-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210705135033.101390-1-f.ebner@proxmox.com> References: <20210705135033.101390-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.579 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH proxmox-widget-toolkit 1/2] node: repos: properly ignore warnings for other properties X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Jul 2021 13:51:11 -0000 Previously, if there were some warnings, but no warnings for the 'Suites' property, it would still display as a warning (without additional text). Signed-off-by: Fabian Ebner --- src/node/APTRepositories.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/node/APTRepositories.js b/src/node/APTRepositories.js index e8f807d..e9e8d92 100644 --- a/src/node/APTRepositories.js +++ b/src/node/APTRepositories.js @@ -275,14 +275,18 @@ Ext.define('Proxmox.node.APTRepositoriesGrid', { header: gettext('Suites'), dataIndex: 'Suites', renderer: function(suites, metaData, record) { + if (!record.data.warnings) { + return suites.join(' '); + } + + const warningTexts = record.data.warnings.filter( + warning => warning.property === 'Suites', + ).map(warning => warning.message); + let err = ''; - if (record.data.warnings && record.data.warnings.length > 0) { - let txt = [gettext('Warning')]; - record.data.warnings.forEach((warning) => { - if (warning.property === 'Suites') { - txt.push(warning.message); - } - }); + if (warningTexts.length > 0) { + const txt = [gettext('Warning')].concat(warningTexts); + metaData.tdAttr = `data-qtip="${Ext.htmlEncode(txt.join('
'))}"`; if (record.data.Enabled) { metaData.tdCls = 'proxmox-invalid-row'; -- 2.30.2