projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1f96239
)
luci-0.10: merge r7872
author
Jo-Philipp Wich
<jow@openwrt.org>
Wed, 2 Nov 2011 19:13:50 +0000
(19:13 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Wed, 2 Nov 2011 19:13:50 +0000
(19:13 +0000)
protocols/3g/luasrc/model/cbi/admin_network/proto_3g.lua
patch
|
blob
|
history
protocols/core/luasrc/model/cbi/admin_network/proto_dhcp.lua
patch
|
blob
|
history
protocols/core/luasrc/model/cbi/admin_network/proto_static.lua
patch
|
blob
|
history
protocols/ppp/luasrc/model/cbi/admin_network/proto_ppp.lua
patch
|
blob
|
history
protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua
patch
|
blob
|
history
protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua
patch
|
blob
|
history
protocols/pptp/luasrc/model/cbi/admin_network/proto_pptp.lua
patch
|
blob
|
history
diff --git
a/protocols/3g/luasrc/model/cbi/admin_network/proto_3g.lua
b/protocols/3g/luasrc/model/cbi/admin_network/proto_3g.lua
index f14434dd828043b5d31e1d321d61d4e36b2ea35d..d59d2331d476c4337cbab6babf3cec883f383e1d 100644
(file)
--- a/
protocols/3g/luasrc/model/cbi/admin_network/proto_3g.lua
+++ b/
protocols/3g/luasrc/model/cbi/admin_network/proto_3g.lua
@@
-97,6
+97,7
@@
dns = section:taboption("advanced", DynamicList, "dns",
dns:depends("peerdns", "")
dns.datatype = "ipaddr"
dns:depends("peerdns", "")
dns.datatype = "ipaddr"
+dns.cast = "string"
keepalive_failure = section:taboption("advanced", Value, "_keepalive_failure",
keepalive_failure = section:taboption("advanced", Value, "_keepalive_failure",
diff --git
a/protocols/core/luasrc/model/cbi/admin_network/proto_dhcp.lua
b/protocols/core/luasrc/model/cbi/admin_network/proto_dhcp.lua
index 806d5cd31504726e0abd4e5c2f03ca09732d981d..68c32f2ea9a05ac7be3899baa27cfbe622c31c3c 100644
(file)
--- a/
protocols/core/luasrc/model/cbi/admin_network/proto_dhcp.lua
+++ b/
protocols/core/luasrc/model/cbi/admin_network/proto_dhcp.lua
@@
-88,6
+88,7
@@
dns = section:taboption("advanced", DynamicList, "dns",
dns:depends("_no_dns", "")
dns.datatype = "ipaddr"
dns:depends("_no_dns", "")
dns.datatype = "ipaddr"
+dns.cast = "string"
metric = section:taboption("advanced", Value, "metric",
metric = section:taboption("advanced", Value, "metric",
diff --git
a/protocols/core/luasrc/model/cbi/admin_network/proto_static.lua
b/protocols/core/luasrc/model/cbi/admin_network/proto_static.lua
index 3c9b14b2baa30d087673da16b39d3a84acb0c1f9..7c9d8e8f343fcc4490ebf1f5dc1f30b36fbae3e9 100644
(file)
--- a/
protocols/core/luasrc/model/cbi/admin_network/proto_static.lua
+++ b/
protocols/core/luasrc/model/cbi/admin_network/proto_static.lua
@@
-42,6
+42,7
@@
dns = section:taboption("general", DynamicList, "dns",
translate("Use custom DNS servers"))
dns.datatype = "ipaddr"
translate("Use custom DNS servers"))
dns.datatype = "ipaddr"
+dns.cast = "string"
if luci.model.network:has_ipv6() then
if luci.model.network:has_ipv6() then
diff --git
a/protocols/ppp/luasrc/model/cbi/admin_network/proto_ppp.lua
b/protocols/ppp/luasrc/model/cbi/admin_network/proto_ppp.lua
index 6cbdd9953cfa48c6b99f54a83feceeb1b059ff38..e2e44fa4caebc4539dbb9e5691f9a01bda9fa2b7 100644
(file)
--- a/
protocols/ppp/luasrc/model/cbi/admin_network/proto_ppp.lua
+++ b/
protocols/ppp/luasrc/model/cbi/admin_network/proto_ppp.lua
@@
-75,6
+75,7
@@
dns = section:taboption("advanced", DynamicList, "dns",
dns:depends("peerdns", "")
dns.datatype = "ipaddr"
dns:depends("peerdns", "")
dns.datatype = "ipaddr"
+dns.cast = "string"
keepalive_failure = section:taboption("advanced", Value, "_keepalive_failure",
keepalive_failure = section:taboption("advanced", Value, "_keepalive_failure",
diff --git
a/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua
b/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua
index 9bc956a79a4d2cc5a87f7d6dfb67263b847583dd..1e99c25a6ab58c6fcfe4fd79ad7e423e196dbdd7 100644
(file)
--- a/
protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua
+++ b/
protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua
@@
-81,6
+81,7
@@
dns = section:taboption("advanced", DynamicList, "dns",
dns:depends("peerdns", "")
dns.datatype = "ipaddr"
dns:depends("peerdns", "")
dns.datatype = "ipaddr"
+dns.cast = "string"
keepalive_failure = section:taboption("advanced", Value, "_keepalive_failure",
keepalive_failure = section:taboption("advanced", Value, "_keepalive_failure",
diff --git
a/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua
b/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua
index 6a5d3c3622d7c45f273f69641949e75c68f59cd9..72df0e43c33fc34be208f73599055688404f308d 100644
(file)
--- a/
protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua
+++ b/
protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua
@@
-75,6
+75,7
@@
dns = section:taboption("advanced", DynamicList, "dns",
dns:depends("peerdns", "")
dns.datatype = "ipaddr"
dns:depends("peerdns", "")
dns.datatype = "ipaddr"
+dns.cast = "string"
keepalive_failure = section:taboption("advanced", Value, "_keepalive_failure",
keepalive_failure = section:taboption("advanced", Value, "_keepalive_failure",
diff --git
a/protocols/pptp/luasrc/model/cbi/admin_network/proto_pptp.lua
b/protocols/pptp/luasrc/model/cbi/admin_network/proto_pptp.lua
index 0d7ca3e4c55f08aac73c2e39778ecb55c0dc8092..fb8a9ac8a583400a808bfe47e06cf2f67d171b02 100644
(file)
--- a/
protocols/pptp/luasrc/model/cbi/admin_network/proto_pptp.lua
+++ b/
protocols/pptp/luasrc/model/cbi/admin_network/proto_pptp.lua
@@
-58,3
+58,4
@@
dns = section:taboption("advanced", DynamicList, "dns",
dns:depends("peerdns", "")
dns.datatype = "ipaddr"
dns:depends("peerdns", "")
dns.datatype = "ipaddr"
+dns.cast = "string"