summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorFlorian Eckert <fe@dev.tdt.de>2019-06-27 15:20:31 +0200
committerGitHub <noreply@github.com>2019-06-27 15:20:31 +0200
commitae1652fc116f542dcefba275d1e7d2f9c6564e12 (patch)
treea69bd6b9271296d503ebdd8217c1514987591fdf
parentb1c218b07a8807ae69aabca70dd1bb48abc47db1 (diff)
parentf17227d3f5000cb28385c6e065246937326437fb (diff)
Merge pull request #2792 from TDT-AG/pr/20190626-luci-proto-qmi
luci-proto-qmi: improvements
-rw-r--r--protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua28
1 files changed, 21 insertions, 7 deletions
diff --git a/protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua b/protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua
index e11201d213..9cc1ae0cf5 100644
--- a/protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua
+++ b/protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua
@@ -4,7 +4,7 @@
local map, section, net = ...
local device, apn, pincode, username, password
-local auth, ipv6
+local auth, ipv6, delay
device = section:taboption("general", Value, "device", translate("Modem device"))
@@ -26,20 +26,34 @@ apn = section:taboption("general", Value, "apn", translate("APN"))
pincode = section:taboption("general", Value, "pincode", translate("PIN"))
+auth = section:taboption("general", Value, "auth", translate("Authentication Type"))
+auth:value("both", "PAP/CHAP (both)")
+auth:value("pap", "PAP")
+auth:value("chap", "CHAP")
+auth:value("none", "NONE")
+auth.default = "none"
+
+
username = section:taboption("general", Value, "username", translate("PAP/CHAP username"))
+username:depends("auth", "pap")
+username:depends("auth", "chap")
+username:depends("auth", "both")
password = section:taboption("general", Value, "password", translate("PAP/CHAP password"))
+password:depends("auth", "pap")
+password:depends("auth", "chap")
+password:depends("auth", "both")
password.password = true
-auth = section:taboption("general", Value, "auth", translate("Authentication Type"))
-auth:value("", translate("-- Please choose --"))
-auth:value("both", "PAP/CHAP (both)")
-auth:value("pap", "PAP")
-auth:value("chap", "CHAP")
-auth:value("none", "NONE")
if luci.model.network:has_ipv6() then
ipv6 = section:taboption("advanced", Flag, "ipv6", translate("Enable IPv6 negotiation"))
ipv6.default = ipv6.disabled
end
+
+delay = section:taboption("advanced", Value, "delay",
+ translate("Modem init timeout"),
+ translate("Maximum amount of seconds to wait for the modem to become ready"))
+delay.placeholder = "10"
+delay.datatype = "min(1)"