diff --git a/webroot/config/networking/networks/ui/js/models/hostRouteModel.js b/webroot/config/networking/networks/ui/js/models/hostRouteModel.js index c70da3af9..f60efcae6 100644 --- a/webroot/config/networking/networks/ui/js/models/hostRouteModel.js +++ b/webroot/config/networking/networks/ui/js/models/hostRouteModel.js @@ -32,13 +32,13 @@ define([ hostRouteModelConfigValidations: { 'prefix': function (value, attr, finalObj) { - if (!((value && value.indexOf('/') != -1) || isValidIP(value))) { + if (!((value && value.indexOf('/') != -1) && isValidIP(value))) { return 'Enter Prefix in form xxx.xxx.xxx.xxx/xx'; } }, 'next_hop': function (value, attr, finalObj) { - if (!(isValidIP(value))) { + if ((value && value.indexOf('/') != -1) || !isValidIP(value)) { return 'Enter Next Hop in form xxx.xxx.xxx.xxx'; } }, diff --git a/webroot/config/networking/networks/ui/js/models/subnetDNSModel.js b/webroot/config/networking/networks/ui/js/models/subnetDNSModel.js index cd8b5d424..a61ae9863 100644 --- a/webroot/config/networking/networks/ui/js/models/subnetDNSModel.js +++ b/webroot/config/networking/networks/ui/js/models/subnetDNSModel.js @@ -34,7 +34,7 @@ define([ if (value && value.length) { var dnsServers = value.split(' '); $.each(dnsServers, function (idx, dnsServer) { - if (!isValidIP(dnsServer)) { + if (dnsServer.indexOf('/') != -1 || !isValidIP(dnsServer)) { err.push(dnsServer); } });