diff options
| -rw-r--r-- | modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js index 171b8f3b33..be8358d0fb 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js @@ -1971,6 +1971,15 @@ return L.view.extend({ is_psk = (enc && Array.isArray(enc.wpa) && L.toArray(enc.authentication).filter(function(a) { return a == 'psk' || a == 'sae' })), replace, passphrase, name, bssid, zone; + var nameUsed = function(name) { + var s = uci.get('network', name); + if (s != null && s['.type'] != 'interface') + return true; + + var net = (s != null) ? network.instantiateNetwork(name) : null; + return (net != null && !net.isEmpty()); + }; + s2.render = function() { return Promise.all([ {}, @@ -1985,13 +1994,13 @@ return L.view.extend({ name.default = 'wwan'; name.rmempty = false; name.validate = function(section_id, value) { - if (uci.get('network', value)) + if (nameUsed(value)) return _('The network name is already used'); return true; }; - for (var i = 2; uci.get('network', name.default); i++) + for (var i = 2; nameUsed(name.default); i++) name.default = 'wwan%d'.format(i); if (is_wep || is_psk) { |