[pve-devel] [PATCH widget-toolkit 1/5] vlan edit: Fix automatic field disabling

Dominic Jäger d.jaeger at proxmox.com
Mon Feb 8 13:41:33 CET 2021


The regex are are created as literals (with // and not new RegExp).
Therefore
 - The old Vlan_match value with double \\  has matched e.g. vlan\ddd instead
   of e.g. vlan123 and
 - the old VlanInterface_match value with double \\ has matched e.g.
   \www\X\dddd instead of e.g. vmbr0.1234

This fixes automatically disabling the fields vlan-raw-device and vlan-id (VLAN
tag) in the VLAN edit window.

Signed-off-by: Dominic Jäger <d.jaeger at proxmox.com>
---
 src/Utils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Utils.js b/src/Utils.js
index 7b78eeb..af5f1db 100644
--- a/src/Utils.js
+++ b/src/Utils.js
@@ -854,7 +854,7 @@ utilities: {
 	me.HostPort_match = new RegExp("^(" + IPV4_REGEXP + "|" + DnsName_REGEXP + ")(?::(\\d+))?$");
 	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.Vlan_match = /^vlan(\d+)/;
+	me.VlanInterface_match = /(\w+)\.(\d+)/;
     },
 });
-- 
2.20.1




More information about the pve-devel mailing list