Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-0.10: merge r6786 and r6787 (#188)

Browse source
This commit is contained in:
Jo-Philipp Wich 2011-01-24 07:40:39 +00:00
parent 658a2a69bd
commit e558edee0b
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
applications/luci-firewall/luasrc/model/cbi/luci_fw/trule.lua
View file

@ -136,6 +136,7 @@ jump.default = "ACCEPT"
jump:value("DROP", translate("drop"))
jump:value("ACCEPT", translate("accept"))
jump:value("REJECT", translate("reject"))
jump:value("NOTRACK", translate("don't track"))
smac = s:taboption("advanced", Value, "src_mac", translate("Source MAC address"))

15
modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
View file

@ -51,9 +51,12 @@ m.title = luci.util.pcdata(wnet:get_i18n())
local iw = luci.sys.wifi.getiwinfo(arg[1])
local tx_powers = iw.txpwrlist or { }
local hw_modes = iw.hwmodelist or { }
local tx_powers = iw.txpwrlist or { }
local tx_power = tostring(
(iw.txpower and iw.txpower > 0 and iw.txpower) or
(#tx_powers > 0 and tx_powers[#tx_powers].dbm)
)
s = m:section(NamedSection, wdev:name(), "wifi-device", translate("Device Configuration"))
s.addremove = false
@ -105,7 +108,7 @@ if hwtype == "mac80211" then
"txpower", translate("Transmit Power"), "dBm")
tp.rmempty = true
tp.default = tostring(iw and iw.txpower or tx_powers[#tx_powers])
tp.default = tx_power
for _, p in ipairs(tx_powers or {}) do
tp:value(p.dbm, "%i dBm (%i mW)" %{ p.dbm, p.mw })
end
@ -156,7 +159,8 @@ if hwtype == "atheros" then
"txpower", translate("Transmit Power"), "dBm")
tp.rmempty = true
for _, p in ipairs(iw.txpwrlist) do
tp.default = tx_power
for _, p in ipairs(tx_powers or {}) do
tp:value(p.dbm, "%i dBm (%i mW)" %{ p.dbm, p.mw })
end
@ -216,7 +220,8 @@ if hwtype == "broadcom" then
"txpower", translate("Transmit Power"), "dBm")
tp.rmempty = true
for _, p in ipairs(iw.txpwrlist) do
tp.default = tx_power
for _, p in ipairs(tx_powers or {}) do
tp:value(p.dbm, "%i dBm (%i mW)" %{ p.dbm, p.mw })
end