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 003E0C1C13 for ; Thu, 18 Jan 2024 15:14:12 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D3E5916233 for ; Thu, 18 Jan 2024 15:14:12 +0100 (CET) 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 for ; Thu, 18 Jan 2024 15:14:11 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 9CEEC491ED for ; Thu, 18 Jan 2024 15:14:11 +0100 (CET) From: Maximiliano Sandoval To: pve-devel@lists.proxmox.com Date: Thu, 18 Jan 2024 15:14:10 +0100 Message-Id: <20240118141410.538521-1-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.002 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [rec.id] Subject: [pve-devel] [PATCH widget-toolkit] certificates: don't display name if there is no name 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: Thu, 18 Jan 2024 14:14:13 -0000 The default certificate does not have a name. Reported-by: Dietmar Maurer Signed-off-by: Maximiliano Sandoval --- src/panel/Certificates.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/panel/Certificates.js b/src/panel/Certificates.js index a522ab6..f924512 100644 --- a/src/panel/Certificates.js +++ b/src/panel/Certificates.js @@ -237,10 +237,16 @@ Ext.define('Proxmox.panel.Certificates', { { xtype: 'proxmoxButton', text: gettext('Delete Custom Certificate'), - confirmMsg: rec => Ext.String.format( - gettext('Are you sure you want to remove the certificate used for {0}'), - me.certById[rec.id].name, - ), + confirmMsg: function(rec) { + let cert = me.certById[rec.id]; + if (cert.name) { + return Ext.String.format( + gettext('Are you sure you want to remove the certificate used for {0}'), + cert.name, + ); + } + return Ext.String.format(gettext('Are you sure you want to remove the certificate')); + }, callback: () => me.reload(), selModel: me.selModel, disabled: true, -- 2.39.2