diff options
| -rw-r--r-- | modules/luci-base/htdocs/luci-static/resources/ui.js | 6 | ||||
| -rw-r--r-- | modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua | 12 |
2 files changed, 18 insertions, 0 deletions
diff --git a/modules/luci-base/htdocs/luci-static/resources/ui.js b/modules/luci-base/htdocs/luci-static/resources/ui.js index 2ba0b0d1e8..f6a964fb10 100644 --- a/modules/luci-base/htdocs/luci-static/resources/ui.js +++ b/modules/luci-base/htdocs/luci-static/resources/ui.js @@ -1327,11 +1327,17 @@ var UIDynamicList = UIElement.extend({ getValue: function() { var items = this.node.querySelectorAll('.item > input[type="hidden"]'), + input = this.node.querySelector('.add-item > input[type="text"]'), v = []; for (var i = 0; i < items.length; i++) v.push(items[i].value); + if (input && input.value != null && input.value.match(/\S/) && + input.classList.contains('cbi-input-invalid') == false && + v.filter(function(s) { return s == input.value }).length == 0) + v.push(input.value); + return v; }, diff --git a/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua index 6cf4bdd244..2e6c026bb2 100644 --- a/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua @@ -1151,6 +1151,18 @@ if hwtype == "mac80211" then ieee80211w:depends({mode="ap-wds", encryption="sae"}) ieee80211w:depends({mode="ap-wds", encryption="sae-mixed"}) ieee80211w:depends({mode="ap-wds", encryption="owe"}) + ieee80211w:depends({mode="sta", encryption="wpa2"}) + ieee80211w:depends({mode="sta-wds", encryption="wpa2"}) + ieee80211w:depends({mode="sta", encryption="psk2"}) + ieee80211w:depends({mode="sta", encryption="psk-mixed"}) + ieee80211w:depends({mode="sta", encryption="sae"}) + ieee80211w:depends({mode="sta", encryption="sae-mixed"}) + ieee80211w:depends({mode="sta", encryption="owe"}) + ieee80211w:depends({mode="sta-wds", encryption="psk2"}) + ieee80211w:depends({mode="sta-wds", encryption="psk-mixed"}) + ieee80211w:depends({mode="sta-wds", encryption="sae"}) + ieee80211w:depends({mode="sta-wds", encryption="sae-mixed"}) + ieee80211w:depends({mode="sta-wds", encryption="owe"}) max_timeout = s:taboption("encryption", Value, "ieee80211w_max_timeout", translate("802.11w maximum timeout"), |