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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 790C662AF5 for ; Thu, 1 Oct 2020 09:57:59 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6438A1E9E2 for ; Thu, 1 Oct 2020 09:57:59 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS id AB7431E9D7 for ; Thu, 1 Oct 2020 09:57:58 +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 745A945AC9 for ; Thu, 1 Oct 2020 09:57:58 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Thu, 1 Oct 2020 09:57:56 +0200 Message-Id: <20201001075757.26446-4-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201001075757.26446-1-d.csapak@proxmox.com> References: <20201001075757.26446-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.145 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [data.host] Subject: [pbs-devel] [PATCH proxmox-backup 1/2] ui: RemoteView: improve host columns X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Oct 2020 07:57:59 -0000 do not show the default (8007) port and only add brackets [] to ipv6 addresses if there is a port Signed-off-by: Dominik Csapak --- www/config/RemoteView.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/www/config/RemoteView.js b/www/config/RemoteView.js index 96788fc7..98f72bb5 100644 --- a/www/config/RemoteView.js +++ b/www/config/RemoteView.js @@ -4,12 +4,15 @@ Ext.define('pmx-remotes', { { name: 'server', calculate: function(data) { - let host = data.host || "localhost"; + let txt = data.host || "localhost"; let port = data.port || "8007"; - if (Proxmox.Utils.IP64_match.test(host)) { - host = `[${host}]`; + if (port.toString() !== "8007") { + if (Proxmox.Utils.IP6_match.test(txt)) { + txt = `[${txt}]`; + } + txt += `:${port}`; } - return `${host}:${port}`; + return txt; } } ], -- 2.20.1