mirror of
https://git.proxmox.com/git/pve-manager
synced 2025-08-07 04:24:07 +00:00
fix IPAddress vtype
This commit is contained in:
parent
035cde2bb6
commit
c9160a2711
@ -31,7 +31,7 @@ var IPV6_H16 = "(?:[0-9a-fA-F]{1,4})";
|
|||||||
var IPV6_LS32 = "(?:(?:" + IPV6_H16 + ":" + IPV6_H16 + ")|" + IPV4_REGEXP + ")";
|
var IPV6_LS32 = "(?:(?:" + IPV6_H16 + ":" + IPV6_H16 + ")|" + IPV4_REGEXP + ")";
|
||||||
|
|
||||||
|
|
||||||
var IP4_match = new RegExp("^(" + IPV4_REGEXP + ")$");
|
var IP4_match = new RegExp("^(?:" + IPV4_REGEXP + ")$");
|
||||||
|
|
||||||
var IPV6_REGEXP = "(?:" +
|
var IPV6_REGEXP = "(?:" +
|
||||||
"(?:(?:" + "(?:" + IPV6_H16 + ":){6})" + IPV6_LS32 + ")|" +
|
"(?:(?:" + "(?:" + IPV6_H16 + ":){6})" + IPV6_LS32 + ")|" +
|
||||||
@ -45,12 +45,12 @@ var IPV6_REGEXP = "(?:" +
|
|||||||
"(?:(?:(?:(?:" + IPV6_H16 + ":){0,7}" + IPV6_H16 + ")?::" + ")" + ")" +
|
"(?:(?:(?:(?:" + IPV6_H16 + ":){0,7}" + IPV6_H16 + ")?::" + ")" + ")" +
|
||||||
")";
|
")";
|
||||||
|
|
||||||
var IP64_match = new RegExp("^(?:" + IPV6_REGEXP + ")$");
|
var IP64_match = new RegExp("^(?:" + IPV6_REGEXP + "|" + IPV4_REGEXP + ")$");
|
||||||
|
|
||||||
// custom Vtypes
|
// custom Vtypes
|
||||||
Ext.apply(Ext.form.field.VTypes, {
|
Ext.apply(Ext.form.field.VTypes, {
|
||||||
IPAddress: function(v) {
|
IPAddress: function(v) {
|
||||||
return IP64_match.test(v);
|
return IP4_match.test(v);
|
||||||
},
|
},
|
||||||
IPAddressText: gettext('Example') + ': 192.168.1.1',
|
IPAddressText: gettext('Example') + ': 192.168.1.1',
|
||||||
IPAddressMask: /[\d\.]/i,
|
IPAddressMask: /[\d\.]/i,
|
||||||
|
Loading…
Reference in New Issue
Block a user