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

luci-mod-admin-full: allow unset txpower value

Browse source 
Sometimes txpower is not set so we should have an option with empty
value to let it stay unset.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
This commit is contained in:
Rafał Miłecki 2017-01-03 15:54:57 +01:00 committed by Jo-Philipp Wich
parent 7cd9ecff00
commit 1cd096d291
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua
View file

@ -94,7 +94,7 @@ local function txpower_current(pwr, list)
end
end
end
return (list[#list] and list[#list].driver_dbm) or pwr or 0
return pwr or ""
end
local iw = luci.sys.wifi.getiwinfo(arg[1])
@ -191,7 +191,7 @@ end
------------------- MAC80211 Device ------------------
if hwtype == "mac80211" then
if #tx_power_list > 1 then
if #tx_power_list > 0 then
tp = s:taboption("general", ListValue,
"txpower", translate("Transmit Power"), "dBm")
tp.rmempty = true
@ -200,6 +200,7 @@ if hwtype == "mac80211" then
return txpower_current(Value.cfgvalue(...), tx_power_list)
end
tp:value("", translate("auto"))
for _, p in ipairs(tx_power_list) do
tp:value(p.driver_dbm, "%i dBm (%i mW)"
%{ p.display_dbm, p.display_mw })
@ -251,6 +252,7 @@ if hwtype == "atheros" then
return txpower_current(Value.cfgvalue(...), tx_power_list)
end
tp:value("", translate("auto"))
for _, p in ipairs(tx_power_list) do
tp:value(p.driver_dbm, "%i dBm (%i mW)"
%{ p.display_dbm, p.display_mw })
@ -308,6 +310,7 @@ if hwtype == "broadcom" then
return txpower_current(Value.cfgvalue(...), tx_power_list)
end
tp:value("", translate("auto"))
for _, p in ipairs(tx_power_list) do
tp:value(p.driver_dbm, "%i dBm (%i mW)"
%{ p.display_dbm, p.display_mw })