public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: "Dominic Jäger" <d.jaeger@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH widget-toolkit 1/5] vlan edit: Fix automatic field disabling
Date: Mon,  8 Feb 2021 13:41:33 +0100	[thread overview]
Message-ID: <20210208124137.125375-1-d.jaeger@proxmox.com> (raw)

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@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




             reply	other threads:[~2021-02-08 12:42 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-08 12:41 Dominic Jäger [this message]
2021-02-08 12:41 ` [pve-devel] [PATCH widget-toolkit 2/5] vlan edit: Forbid blank vlan raw device Dominic Jäger
2021-02-08 12:41 ` [pve-devel] [PATCH widget-toolkit 3/5] vlan edit: Move example from default value to tooltip Dominic Jäger
2021-02-08 12:41 ` [pve-devel] [PATCH widget-toolkit 4/5] vlan edit: Set valid default name Dominic Jäger
2021-02-08 12:41 ` [pve-devel] [PATCH widget-toolkit 5/5] vlan edit: Match explicit values to name field Dominic Jäger
2021-02-09 13:29 ` [pve-devel] applied-series: [PATCH widget-toolkit 1/5] vlan edit: Fix automatic field disabling Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210208124137.125375-1-d.jaeger@proxmox.com \
    --to=d.jaeger@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal