luci-app-olsr: handle empty result for non-status tables

[oweals/luci.git] / protocols / luci-proto-ncm / luasrc / model / cbi / admin_network / proto_ncm.lua

diff --git a/protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua b/protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua
index b258dfc5982fb9ea8dbbd671b718de496fdcd0c3..3fe4ef33aa41c2ad02cb7b49f8529f0913d93682 100644 (file)
--- a/protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua
+++ b/protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua
@@ -12,23 +12,20 @@ You may obtain a copy of the License at
 
 local map, section, net = ...
 
-local device, apn, service, pincode, username, password
+local device, apn, service, pincode, username, password, dialnum
 local ipv6, delay, defaultroute, metric, peerdns, dns
 
 
 device = section:taboption("general", Value, "device", translate("Modem device"))
 device.rmempty = false
 
-local device_suggestions = nixio.fs.glob("/dev/cdc-wdm*")
-       or nixio.fs.glob("/dev/ttyUSB*")
-
-if device_suggestions then
-       local node
-       for node in device_suggestions do
-               device:value(node)
-       end
+local dev
+for dev in nixio.fs.glob("/dev/ttyUSB*") do
+    device:value(dev)
+end
+for dev in nixio.fs.glob("/dev/cdc-wdm*") do
+    device:value(dev)
 end
-
 
 mode = section:taboption("general", Value, "mode", translate("Service Type"))
 mode:value("", translate("Modem default"))
@@ -60,6 +57,10 @@ password = section:taboption("general", Value, "password", translate("PAP/CHAP p
 password.password = true
 
 
+dialnum = section:taboption("general", Value, "dialnum", translate("Dial number"))
+dialnum.placeholder = "*99#"
+
+
 if luci.model.network:has_ipv6() then
 
        ipv6 = section:taboption("advanced", ListValue, "ipv6")