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 CD33072E35 for ; Wed, 14 Apr 2021 11:53:59 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BFE76CA57 for ; Wed, 14 Apr 2021 11:53:59 +0200 (CEST) Received: from dev.dominic.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP id 31E26CA48 for ; Wed, 14 Apr 2021 11:53:59 +0200 (CEST) Received: by dev.dominic.proxmox.com (Postfix, from userid 0) id 10CFC228C3; Wed, 14 Apr 2021 11:53:53 +0200 (CEST) From: =?UTF-8?q?Dominic=20J=C3=A4ger?= To: pve-devel@lists.proxmox.com Date: Wed, 14 Apr 2021 11:53:13 +0200 Message-Id: <20210414095313.96550-2-d.jaeger@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210414095313.96550-1-d.jaeger@proxmox.com> References: <20210414095313.96550-1-d.jaeger@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 2 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 RDNS_NONE 1.274 Delivered to internal network by a host with no rDNS 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 Subject: [pve-devel] [PATCH widget-toolkit] Fix #2711: vlan edit: Allow 'v' as VLAN separator 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: Wed, 14 Apr 2021 09:53:59 -0000 Set the VLAN raw device and VLAN ID fields in the GUI correctly when VLANs are specified with 'v' instead of a dot, vmbr0v5 for example. Signed-off-by: Dominic Jäger --- src/Utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Utils.js b/src/Utils.js index 3fd8f91..2d58ad9 100644 --- a/src/Utils.js +++ b/src/Utils.js @@ -1046,7 +1046,7 @@ utilities: { me.HostPortBrackets_match = new RegExp("^\\[(" + IPV6_REGEXP + "|" + IPV4_REGEXP + "|" + DnsName_REGEXP + ")\\](?::(\\d+))?$"); me.IP6_dotnotation_match = new RegExp("^(" + IPV6_REGEXP + ")(?:\\.(\\d+))?$"); me.Vlan_match = /^vlan(\d+)/; - me.VlanInterface_match = /(\w+)\.(\d+)/; + me.VlanInterface_match = /(\w+)[v.](\d+)/; }, }); -- 2.20.1